diff options
| -rwxr-xr-x | bin/dobin | 6 | ||||
| -rwxr-xr-x | bin/doexe | 8 | ||||
| -rwxr-xr-x | bin/doinitd | 4 | ||||
| -rwxr-xr-x | bin/ebuild.sh | 13 |
4 files changed, 16 insertions, 15 deletions
@@ -3,8 +3,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh + if [[ $# -lt 1 ]] ; then - echo "$0: at least one argument needed" 1>&2 + vecho "$0: at least one argument needed" 1>&2 exit 1 fi @@ -18,7 +20,7 @@ for x in "$@" ; do if [[ -e ${x} ]] ; then install -m0755 -o ${PORTAGE_INST_UID:-0} -g ${PORTAGE_INST_GID:-0} "${x}" "${D}${DESTTREE}/bin" else - echo "!!! ${0##*/}: ${x} does not exist" 1>&2 + vecho "!!! ${0##*/}: ${x} does not exist" 1>&2 false fi ((ret+=$?)) @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -10,8 +10,8 @@ if [[ $# -lt 1 ]] ; then exit 1 fi -if [[ ! -d ${D}${EXEDESTTREE} ]] ; then - install -d "${D}${EXEDESTTREE}" +if [[ ! -d ${D}${_E_EXEDESTTREE_} ]] ; then + install -d "${D}${_E_EXEDESTTREE_}" fi for x in "$@" ; do @@ -24,5 +24,5 @@ for x in "$@" ; do else mysrc="${x}" fi - install ${EXEOPTIONS} "${mysrc}" "${D}${EXEDESTTREE}" + install ${EXEOPTIONS} "${mysrc}" "${D}${_E_EXEDESTTREE_}" done diff --git a/bin/doinitd b/bin/doinitd index e8d9f69fa..0f1af9406 100755 --- a/bin/doinitd +++ b/bin/doinitd @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -10,5 +10,5 @@ fi exec \ env \ -EXEDESTTREE="/etc/init.d/" \ +_E_EXEDESTTREE_="/etc/init.d/" \ doexe "$@" diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 8f866d7b8..755b0ba39 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -270,7 +270,7 @@ register_die_hook() { umask 022 export DESTTREE=/usr export INSDESTTREE="" -export EXEDESTTREE="" +export _E_EXEDESTTREE_="" export _E_DOCDESTTREE_="" export INSOPTIONS="-m0644" export EXEOPTIONS="-m0755" @@ -750,11 +750,11 @@ insinto() { exeinto() { if [ "$1" == "/" ]; then - export EXEDESTTREE="" + export _E_EXEDESTTREE_="" else - export EXEDESTTREE="$1" - if [ ! -d "${D}${EXEDESTTREE}" ]; then - install -d "${D}${EXEDESTTREE}" + export _E_EXEDESTTREE_="$1" + if [ ! -d "${D}${_E_EXEDESTTREE_}" ]; then + install -d "${D}${_E_EXEDESTTREE_}" fi fi } @@ -762,7 +762,6 @@ exeinto() { docinto() { if [ "$1" == "/" ]; then export _E_DOCDESTTREE_="" - eqawarn "QA Notice: invalid usage of docinto" else export _E_DOCDESTTREE_="$1" if [ ! -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" ]; then |