touchup how we report the binary name in output

Package-Manager: portage-2.1_pre7-r4

2 files changed, 16 insertions, 15 deletions

diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 44c708625b73..db24ff2c0c39 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -7,9 +7,9 @@ SHA256 396de175158f1a4c772ccda60e1e6db2b3eebb78562b01bacec6ed9b429e4395 ChangeLo
 MD5 bdcfb966ea96cc8dd990649559be472d binutils-config-1.8-r6.ebuild 575
 RMD160 00ea7c09d0b293d9c0091a5ae407d53a022e1ba0 binutils-config-1.8-r6.ebuild 575
 SHA256 266e308d5e79509e845d1148fae6a022cadf0a0cc31bfc23ac65806feff8fb83 binutils-config-1.8-r6.ebuild 575
-MD5 641a1f247a290bbd2a1bdfa0fa7e0a5e files/binutils-config-1.8 9987
-RMD160 f243b9776dc485758798d2461c254a6428b65a51 files/binutils-config-1.8 9987
-SHA256 d0ed8818eac3a629c0affb08188f9dcc10e3269711db025f410afabea7cdf965 files/binutils-config-1.8 9987
+MD5 43c7ead858241a2576a39a7e5849a98c files/binutils-config-1.8 10055
+RMD160 71ecfff1daeb1b1729c89d2d0aa3030e3cf2c0e1 files/binutils-config-1.8 10055
+SHA256 8de6a37984f851b549ebf640b9aeddfffbde51010c50fb877bd8ec7f5ce05f48 files/binutils-config-1.8 10055
 MD5 953efbc2a688428dfb75ecfa3c2d3d43 files/binutils-config.8 2989
 RMD160 afb26717c9466456bbbdf6a3d6b93aeb63ff9416 files/binutils-config.8 2989
 SHA256 ffc462de3eaa865f77f00e36275a0a9b0b51782d9d4d5fcfad18583a13adf6e5 files/binutils-config.8 2989
@@ -22,7 +22,7 @@ SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEK+I6AiZjviIA2XgRAq0CAKCy9GDutqhiLyof1bDkJqcx+5R/OgCgiVcb
-enVJ9/rPKlltWbXIgozga/s=
-=63J7
+iD8DBQFEOaGZ2+ySkm8kpY0RAsUpAJwKY6RtVX+Wvd7u5tWGLv2tbbyFGQCfclEq
+bKRoLjUjcWV/ewFy/3HX5yY=
+=d8pk
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/files/binutils-config-1.8 b/sys-devel/binutils-config/files/binutils-config-1.8
index 588e9dda1b6b..79a8993c5e18 100755
--- a/sys-devel/binutils-config/files/binutils-config-1.8
+++ b/sys-devel/binutils-config/files/binutils-config-1.8
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.11 2006/02/01 03:46:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.12 2006/04/10 00:05:26 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -11,8 +11,9 @@ cd /
 
 trap ":" INT QUIT TSTP
 
+argv0=${0##*/}
 source /etc/init.d/functions.sh || {
-	echo "$0: Could not source /etc/init.d/functions.sh!"
+	echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2
 	exit 1
 }
 umask 022
@@ -167,7 +168,7 @@ switch_profile() {
 
 uninstall_target() {
 	if [[ ${TARGET} == ${HOST} ]] ; then
-		eerror "$0: Refusing to uninstall native binutils"
+		eerror "${argv0}: Refusing to uninstall native binutils"
 		exit 1
 	fi
 
@@ -179,7 +180,7 @@ uninstall_target() {
 		rm -f "${ENV_D}"/${PROFILE}
 	done
 	if [[ -z ${PROFILE} ]] && [[ ! -e ${ENV_D}/config-${TARGET} ]] ; then
-		eerror "$0: No profiles exist for '${TARGET}'"
+		eerror "${argv0}: No profiles exist for '${TARGET}'"
 		exit 1
 	fi
 
@@ -209,14 +210,14 @@ uninstall_target() {
 
 get_current_profile() {
 	if [[ ! -f ${ENV_D}/config-${PROFILE} ]] ; then
-		eerror "$0: No binutils profile is active!"
+		eerror "${argv0}: No binutils profile is active!"
 		return 1
 	fi
 
 	source "${ENV_D}/config-${PROFILE}"
 
 	if [[ -z ${CURRENT} ]] ; then
-		eerror "$0: No binutils profile is active!"
+		eerror "${argv0}: No binutils profile is active!"
 		return 1
 	fi
 
@@ -304,7 +305,7 @@ while [[ $# -gt 0 ]] ; do
 			exit 0
 			;;
 		-v|--version)
-			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.11 2006/02/01 03:46:46 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.12 2006/04/10 00:05:26 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			echo "binutils-config-${cvsver%%,v *}"
 			exit 0
@@ -328,7 +329,7 @@ while [[ $# -gt 0 ]] ; do
 			;;
 		*)
 			if [[ -n ${PROFILE} ]] && [[ ${PROFILE} != "current" ]] ; then
-				eerror "$0: Too many arguments!  Run $0 without parameters for help."
+				eerror "${argv0}: Too many arguments!  Run ${argv0} without parameters for help."
 				exit 1
 			fi
 
@@ -356,7 +357,7 @@ while [[ $# -gt 0 ]] ; do
 					if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then
 						x=${HOST}-${x}
 					else
-						eerror "$0: Could not locate '$x' in '${ENV_D}/'!"
+						eerror "${argv0}: Could not locate '$x' in '${ENV_D}/'!"
 						exit 1
 					fi
 				fi