* 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.

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