From 8bdba93c1a5d3b7500dec73a12fa9c40b43b9e2a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 16 Sep 2012 18:36:08 -0700 Subject: __strip_duplicate_slashes: quote paths --- bin/bashrc-functions.sh | 2 +- bin/phase-helpers.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/bashrc-functions.sh b/bin/bashrc-functions.sh index 30a7a8e1e..f1b6bb538 100644 --- a/bin/bashrc-functions.sh +++ b/bin/bashrc-functions.sh @@ -29,7 +29,7 @@ __strip_duplicate_slashes() { while [[ ${removed} == *//* ]] ; do removed=${removed//\/\///} done - echo ${removed} + echo "${removed}" fi } diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index ddc96edc6..157725ff3 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -476,7 +476,7 @@ econf() { CONF_PREFIX=${CONF_PREFIX#*=} [[ ${CONF_PREFIX} != /* ]] && CONF_PREFIX="/${CONF_PREFIX}" [[ ${CONF_LIBDIR} != /* ]] && CONF_LIBDIR="/${CONF_LIBDIR}" - set -- --libdir="$(__strip_duplicate_slashes ${CONF_PREFIX}${CONF_LIBDIR})" "$@" + set -- --libdir="$(__strip_duplicate_slashes "${CONF_PREFIX}${CONF_LIBDIR}")" "$@" fi set -- \ @@ -521,7 +521,7 @@ einstall() { unset LIBDIR_VAR if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:+set}" = set ]; then EI_DESTLIBDIR="${D}/${CONF_PREFIX}/${CONF_LIBDIR}" - EI_DESTLIBDIR="$(__strip_duplicate_slashes ${EI_DESTLIBDIR})" + EI_DESTLIBDIR="$(__strip_duplicate_slashes "${EI_DESTLIBDIR}")" LOCAL_EXTRA_EINSTALL="libdir=${EI_DESTLIBDIR} ${LOCAL_EXTRA_EINSTALL}" unset EI_DESTLIBDIR fi -- cgit v1.2.3-1-g7c22