From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 35C1E138010 for ; Mon, 17 Sep 2012 01:36:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB2C7E06B5; Mon, 17 Sep 2012 01:36:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 80E3EE06B5 for ; Mon, 17 Sep 2012 01:36:26 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DBE6D33C99E for ; Mon, 17 Sep 2012 01:36:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4FA68E5442 for ; Mon, 17 Sep 2012 01:36:23 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1347845768.8bdba93c1a5d3b7500dec73a12fa9c40b43b9e2a.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/bashrc-functions.sh bin/phase-helpers.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8bdba93c1a5d3b7500dec73a12fa9c40b43b9e2a X-VCS-Branch: master Date: Mon, 17 Sep 2012 01:36:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1e07809c-1a85-4bf0-8155-af504285e955 X-Archives-Hash: 22c58ac1fcfd8c5e0d5e5cb229a0d781 commit: 8bdba93c1a5d3b7500dec73a12fa9c40b43b9e2a Author: Zac Medico gentoo org> AuthorDate: Mon Sep 17 01:36:08 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Sep 17 01:36:08 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8bdba93c __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 30a7a8e..f1b6bb5 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 ddc96ed..157725f 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