[gentoo-commits] proj/portage:master commit in: bin/, bin/ebuild-helpers/

[Zac Medico]

commit:     9897d71134187f4cd7f28d8eec9e81e9274d54e6
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 28 05:46:15 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Mar 28 05:47:11 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=9897d711

prepstrip: fix ${0} usage

Fixes: a67dc215adb5 ("prepstrip: rename to bin/estrip (refactor for EAPI 7 
dostrip)")

 bin/ebuild-helpers/prepstrip | 2 +-
 bin/estrip                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip
index 9db06284d..ecbea47ec 100755
--- a/bin/ebuild-helpers/prepstrip
+++ b/bin/ebuild-helpers/prepstrip
@@ -8,4 +8,4 @@ if ___eapi_has_dostrip; then
        die "${0##*/}: ${0##*/} has been banned for EAPI '$EAPI'; use 'dostrip' 
instead"
 fi
 
-exec -a "${0}" "${PORTAGE_BIN_PATH}"/estrip "${@}"
+__PORTAGE_HELPER=prepstrip exec "${PORTAGE_BIN_PATH}"/estrip "${@}"

diff --git a/bin/estrip b/bin/estrip
index fbd5882fa..41686aa39 100755
--- a/bin/estrip
+++ b/bin/estrip
@@ -30,7 +30,7 @@ if ${RESTRICT_strip} || ${FEATURES_nostrip} ; then
        ${FEATURES_installsources} || exit 0
 fi
 
-[[ ${0##*/} == prepstrip ]] && prepstrip=true || prepstrip=false
+[[ ${__PORTAGE_HELPER} == prepstrip ]] && prepstrip=true || prepstrip=false
 
 if ! ${prepstrip}; then
 while [[ $# -gt 0 ]] ; do