diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-02-07 19:41:09 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-02-07 19:41:09 +0000 |
| commit | 702d1529d6d7cedd4255e3e6da0be5cca2a69f05 (patch) | |
| tree | a2c9e13a87c8dd7d05db08c45986823334ca4faa | |
| parent | e1d14d00cfecaac0812515a21bb2e8c7f5941675 (diff) | |
| download | portage-702d1529d6d7cedd4255e3e6da0be5cca2a69f05.tar.gz portage-702d1529d6d7cedd4255e3e6da0be5cca2a69f05.tar.bz2 portage-702d1529d6d7cedd4255e3e6da0be5cca2a69f05.zip | |
Escape globs in hasgq arguments in order to prevent bash from trying
to perform filename expansion.
svn path=/main/trunk/; revision=12591
| -rwxr-xr-x | bin/ebuild.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 124fd35ab..301eb7949 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -486,9 +486,9 @@ econf() { if [[ -n ${ABI} && -n ${!LIBDIR_VAR} ]] ; then CONF_LIBDIR=${!LIBDIR_VAR} fi - if [[ -n ${CONF_LIBDIR} ]] && ! hasgq --libdir=* "$@" ; then - export CONF_PREFIX=$(hasg --exec-prefix=* "$@") - [[ -z ${CONF_PREFIX} ]] && CONF_PREFIX=$(hasg --prefix=* "$@") + if [[ -n ${CONF_LIBDIR} ]] && ! hasgq --libdir=\* "$@" ; then + export CONF_PREFIX=$(hasg --exec-prefix=\* "$@") + [[ -z ${CONF_PREFIX} ]] && CONF_PREFIX=$(hasg --prefix=\* "$@") : ${CONF_PREFIX:=/usr} CONF_PREFIX=${CONF_PREFIX#*=} [[ ${CONF_PREFIX} != /* ]] && CONF_PREFIX="/${CONF_PREFIX}" |