diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-11-01 19:17:19 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-11-01 19:17:19 -0700 |
commit | 1af0c40b1300651ca03a7509f49f152c1e595736 (patch) | |
tree | 6d967ae665bf98c9ba8219fb812a9678a127a57e /bin/ebuild-helpers/dosbin | |
parent | 889853171246ab1063bb5015caf41a41761f5424 (diff) | |
download | portage-1af0c40b1300651ca03a7509f49f152c1e595736.tar.gz portage-1af0c40b1300651ca03a7509f49f152c1e595736.tar.bz2 portage-1af0c40b1300651ca03a7509f49f152c1e595736.zip |
Add EPREFIX and ED support in all ebuild helpers.
This allows our prefix tests to use helpers like insinto, doins, and dosym.
Diffstat (limited to 'bin/ebuild-helpers/dosbin')
-rwxr-xr-x | bin/ebuild-helpers/dosbin | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/ebuild-helpers/dosbin b/bin/ebuild-helpers/dosbin index 87a30914a..d0783ed33 100755 --- a/bin/ebuild-helpers/dosbin +++ b/bin/ebuild-helpers/dosbin @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh @@ -9,15 +9,17 @@ if [[ $# -lt 1 ]] ; then exit 1 fi -if [[ ! -d ${D}${DESTTREE}/sbin ]] ; then - install -d "${D}${DESTTREE}/sbin" || { helpers_die "${0##*/}: failed to install ${D}${DESTTREE}/sbin"; exit 2; } +case "$EAPI" in 0|1|2) ED=${D} ;; esac + +if [[ ! -d ${ED}${DESTTREE}/sbin ]] ; then + install -d "${ED}${DESTTREE}/sbin" || { helpers_die "${0##*/}: failed to install ${ED}${DESTTREE}/sbin"; exit 2; } fi ret=0 for x in "$@" ; do if [[ -e ${x} ]] ; then - install -m0755 -o ${PORTAGE_INST_UID:-0} -g ${PORTAGE_INST_GID:-0} "${x}" "${D}${DESTTREE}/sbin" + install -m0755 -o ${PORTAGE_INST_UID:-0} -g ${PORTAGE_INST_GID:-0} "${x}" "${ED}${DESTTREE}/sbin" else echo "!!! ${0##*/}: ${x} does not exist" 1>&2 false |