__strip_duplicate_slashes: quote paths

diff --git a/bin/bashrc-functions.sh b/bin/bashrc-functions.sh
index 30a7a8e1e03e0d660c1a21dea0678bb114cc3aba..f1b6bb538a20ab89d4cdf6ad07be2ea67ebdedd3 100644 (file)
--- 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 ddc96edc6c783c13822177fee660e32a74685b76..157725ff3c52f1284ed8732fab8d7dc0a429ba51 100644 (file)
--- 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