From f6d435b8a12fc2b3994041fdf8755cd9bf8c4d57 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 11 Mar 2009 03:47:19 +0000 Subject: [PATCH] Escape globs in hasgq arguments in order to prevent bash from trying to perform filename expansion. (trunk r12591) svn path=/main/branches/2.1.6/; revision=12872 --- bin/ebuild.sh | 6 +++--- 1 file 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}" -- 2.26.2