diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-08-18 23:31:49 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-08-18 23:31:49 -0700 |
commit | 0913983443dd9cca07705ca8381c2e5c38b0de73 (patch) | |
tree | c8de4320424ad75cb84f0836c5e0213f8945eb61 /bin/ebuild-helpers/dobin | |
parent | 214ba4d809e352cadde48dfc9f8b203cb1bd21a6 (diff) | |
download | portage-0913983443dd9cca07705ca8381c2e5c38b0de73.tar.gz portage-0913983443dd9cca07705ca8381c2e5c38b0de73.tar.bz2 portage-0913983443dd9cca07705ca8381c2e5c38b0de73.zip |
* In helpers_die arguments, display ${0##*/} instead of $0 since $0
is needlessly long.
* When calling helpers_die from a function, use ${FUNCNAME[0]} in
arguments instead of $0.
Diffstat (limited to 'bin/ebuild-helpers/dobin')
-rwxr-xr-x | bin/ebuild-helpers/dobin | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/ebuild-helpers/dobin b/bin/ebuild-helpers/dobin index fc0b0359f..e385455d7 100755 --- a/bin/ebuild-helpers/dobin +++ b/bin/ebuild-helpers/dobin @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh if [[ $# -lt 1 ]] ; then - helpers_die "$0: at least one argument needed" + helpers_die "${0##*/}: at least one argument needed" exit 1 fi if [[ ! -d ${D}${DESTTREE}/bin ]] ; then - install -d "${D}${DESTTREE}/bin" || { helpers_die "$0: failed to install ${D}${DESTTREE}/bin"; exit 2; } + install -d "${D}${DESTTREE}/bin" || { helpers_die "${0##*/}: failed to install ${D}${DESTTREE}/bin"; exit 2; } fi ret=0 @@ -25,5 +25,5 @@ for x in "$@" ; do ((ret|=$?)) done -[[ $ret -ne 0 ]] && helpers_die "$0 failed" +[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed" exit ${ret} |