From b7fa7c80fbe46360e5f37e01f4f51ed2f2244191 Mon Sep 17 00:00:00 2001 From: Simon Stelling Date: Mon, 1 May 2006 21:33:34 +0000 Subject: replace hardcoded /usr/lib/portage/bin with PORTAGE_BIN_PATH, defaulting to the hardcoded value svn path=/main/trunk/; revision=3297 --- bin/doexe | 2 +- bin/doins | 2 +- bin/doman | 2 +- bin/prepall | 2 +- bin/prepalldocs | 2 +- bin/prepallinfo | 2 +- bin/prepallman | 2 +- bin/prepinfo | 2 +- bin/preplib | 2 +- bin/prepman | 2 +- bin/prepstrip | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'bin') diff --git a/bin/doexe b/bin/doexe index 257bfea8e..818c8a5b3 100755 --- a/bin/doexe +++ b/bin/doexe @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/doexe,v 1.10.2.1 2004/12/06 03:01:43 carpaski Exp $ -source /usr/lib/portage/bin/isolated-functions.sh +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh if [[ $# -lt 1 ]] ; then echo "$0: at least one argument needed" 1>&2 diff --git a/bin/doins b/bin/doins index aab6e9916..f35cbc63a 100755 --- a/bin/doins +++ b/bin/doins @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/doins,v 1.7.2.2 2004/12/17 22:25:13 carpaski Exp $ -source /usr/lib/portage/bin/isolated-functions.sh +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh if [ $# -lt 1 ] ; then echo "${0}: at least one argument needed" diff --git a/bin/doman b/bin/doman index a04339d52..2ed65ffc7 100755 --- a/bin/doman +++ b/bin/doman @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/doman,v 1.13.2.2 2005/07/29 05:55:34 vapier Exp $ -source /usr/lib/portage/bin/isolated-functions.sh +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh if [[ $# -lt 1 ]] ; then echo "$0: at least one argument needed" 1>&2 diff --git a/bin/prepall b/bin/prepall index 74570e6e2..4772574a7 100755 --- a/bin/prepall +++ b/bin/prepall @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: prepall 2230 2005-11-01 01:35:59Z vapier $ -source /usr/lib/portage/bin/isolated-functions.sh +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh prepallman prepallinfo diff --git a/bin/prepalldocs b/bin/prepalldocs index a2c4e76e5..d8b8b7473 100755 --- a/bin/prepalldocs +++ b/bin/prepalldocs @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/prepalldocs,v 1.6 2004/10/04 13:56:50 vapier Exp $ -source /usr/lib/portage/bin/isolated-functions.sh +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh z="$(find "${D}"usr/share/doc \( -type f -or -type l \) -not -name "*.gz" -not -name "*.js" 2>/dev/null)" diff --git a/bin/prepallinfo b/bin/prepallinfo index 268d090df..205316ab1 100755 --- a/bin/prepallinfo +++ b/bin/prepallinfo @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/prepallinfo,v 1.6 2004/10/04 13:56:50 vapier Exp $ -source /usr/lib/portage/bin/isolated-functions.sh +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh [[ ! -d ${D}usr/share/info ]] && exit 0 diff --git a/bin/prepallman b/bin/prepallman index 582f4003f..85a7277d3 100755 --- a/bin/prepallman +++ b/bin/prepallman @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/prepallman,v 1.10 2004/10/04 13:56:50 vapier Exp $ -source /usr/lib/portage/bin/isolated-functions.sh +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh ret=0 diff --git a/bin/prepinfo b/bin/prepinfo index 5863ffd3f..dac4b6acc 100755 --- a/bin/prepinfo +++ b/bin/prepinfo @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/prepinfo,v 1.6.2.1 2005/05/29 12:40:08 jstubbs Exp $ -source /usr/lib/portage/bin/isolated-functions.sh +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh if [ -z "$1" ] ; then z="${D}usr/share/info" diff --git a/bin/preplib b/bin/preplib index b42fb9bae..ab784d2c5 100755 --- a/bin/preplib +++ b/bin/preplib @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/preplib,v 1.7.2.1 2005/01/02 09:36:02 jstubbs Exp $ -source /usr/lib/portage/bin/isolated-functions.sh +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh vecho "QA Notice: Please stop using me, fix your package instead" 1>&2 diff --git a/bin/prepman b/bin/prepman index ba70a4b8a..9e5e41984 100755 --- a/bin/prepman +++ b/bin/prepman @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/prepman,v 1.10.2.3 2005/05/29 12:40:08 jstubbs Exp $ -source /usr/lib/portage/bin/isolated-functions.sh +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh if [[ -z $1 ]] ; then z="${D}usr/share/man" diff --git a/bin/prepstrip b/bin/prepstrip index 44b6b519e..cd28ec111 100755 --- a/bin/prepstrip +++ b/bin/prepstrip @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/prepstrip,v 1.23.2.3 2005/08/15 02:58:20 vapier Exp $ -source /usr/lib/portage/bin/isolated-functions.sh +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh if [[ " ${FEATURES} " == *" nostrip "* ]] || \ [[ " ${RESTRICT} " == *" nostrip "* ]] || \ -- cgit v1.2.3-1-g7c22