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/newins | |
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/newins')
-rwxr-xr-x | bin/ebuild-helpers/newins | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/ebuild-helpers/newins b/bin/ebuild-helpers/newins index 3d4870f8d..9da212fb5 100755 --- a/bin/ebuild-helpers/newins +++ b/bin/ebuild-helpers/newins @@ -1,11 +1,11 @@ #!/bin/bash -# Copyright 1999-2009 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 [[ -z ${T} ]] || [[ -z ${2} ]] ; then - helpers_die "$0: Need two arguments, old file and new file" + helpers_die "${0##*/}: Need two arguments, old file and new file" exit 1 fi @@ -22,12 +22,12 @@ case "$EAPI" in *) cp -P "$1" "$T/$2" ret=$? - [[ $ret -ne 0 ]] && helpers_die "$0 failed" + [[ $ret -ne 0 ]] && helpers_die "${0##*/} failed" exit $ret ;; esac doins "${T}/${2}" ret=$? rm -rf "${T}/${2}" -[[ $ret -ne 0 ]] && helpers_die "$0 failed" +[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed" exit $ret |