cp -> $CP rm -> $RM touch -> $TOUCH etc... #90643

(Portage version: 2.0.51.20-r4)

3 files changed, 66 insertions, 63 deletions

diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.10 b/sys-devel/gcc-config/files/gcc-config-1.3.10
index 34d781f0758a..7d5a47be833b 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.10
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.10
@@ -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/gcc-config/files/gcc-config-1.3.10,v 1.8 2005/04/09 18:37:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.10,v 1.9 2005/04/28 01:44:44 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -62,23 +62,24 @@ find_path() {
 cmd_setup() {
 	# Sourcing /etc/env.d/gcc/${CC_COMP} is going to mess up
 	# PATH among things...
-	CP="$(find_path cp)"
-	RM="$(find_path rm)"
-	MV="$(find_path mv)"
-	LN="$(find_path ln)"
-	CAT="$(find_path cat)"
-	AWK="$(find_path gawk)"
-	GREP="$(find_path grep)"
-	FIND="$(find_path find)"
-	CHMOD="$(find_path chmod)"
-	TOUCH="$(find_path touch)"
-	ENV_UPDATE="$(find_path env-update)"
+	CP=$(find_path cp)
+	RM=$(find_path rm)
+	MV=$(find_path mv)
+	LN=$(find_path ln)
+	CAT=$(find_path cat)
+	AWK=$(find_path gawk)
+	GREP=$(find_path grep)
+	FIND=$(find_path find)
+	CHMOD=$(find_path chmod)
+	TOUCH=$(find_path touch)
+	PORTAGEQ=$(find_path portageq)
+	ENV_UPDATE=$(find_path env-update)
 }
 
 get_real_chost() {
 	[[ -n ${REAL_CHOST} ]] && return 0
 
-	export REAL_CHOST="$(env -u CHOST portageq envvar CHOST)"
+	export REAL_CHOST=$(env -u CHOST ${PORTAGEQ} envvar CHOST)
 
 	if [[ -z ${REAL_CHOST} ]] ; then
 		eerror "$0: Could not get portage CHOST!"
@@ -207,13 +208,13 @@ switch_profile() {
 		if [[ -x ${ref} ]] ; then
 			${CP} -f "${ROOT}/usr/lib/misc/gcc-config" \
 			         "${ROOT}/usr/bin/${x}"
-			touch -r "${ref}" "${ROOT}/usr/bin/${x}"
+			${TOUCH} -r "${ref}" "${ROOT}/usr/bin/${x}"
 
 			# Install 32bit and 64bit wrappers if need be
 			# This should probably get folded back into the wrapper ...
 			if [[ ${x:${#x}-3} == "gcc" ]] || [[ ${x:${#x}-3} == "g++" ]] ; then
 				for bits in ${GCCBITS} ; do
-					cp -f "${ROOT}/usr/lib/misc/gcc-config" \
+					${CP} -f "${ROOT}/usr/lib/misc/gcc-config" \
 						"${ROOT}/usr/bin/${x}${bits}"
 				done
 			fi
@@ -241,8 +242,8 @@ switch_profile() {
 			libdir="lib/$(${ROOT}/${GCC_BIN_PATH}/gcc ${multiarg} -print-multi-os-directory)"
 			for gcclib in gcc_s unwind ; do
 				if [[ -e ${ROOT}/${LDPATH}/${multildir}/lib${gcclib}.so ]]; then
-					rm -f "${ROOT}/${libdir}"/lib${gcclib}.so*
-					cp -a "${ROOT}/${LDPATH}/${multilibdir}"/lib${gcclib}.so* "${ROOT}/${libdir}"/
+					${RM} -f "${ROOT}/${libdir}"/lib${gcclib}.so*
+					${CP} -a "${ROOT}/${LDPATH}/${multilibdir}"/lib${gcclib}.so* "${ROOT}/${libdir}"/
 				fi
 			done
 		done
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.8 b/sys-devel/gcc-config/files/gcc-config-1.3.8
index 8f3269ada8c3..94fd161bee71 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.8
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.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/gcc-config/files/gcc-config-1.3.8,v 1.11 2005/04/09 18:37:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.8,v 1.12 2005/04/28 01:44:44 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -62,23 +62,24 @@ find_path() {
 cmd_setup() {
 	# Sourcing /etc/env.d/gcc/${CC_COMP} is going to mess up
 	# PATH among things...
-	CP="$(find_path cp)"
-	RM="$(find_path rm)"
-	MV="$(find_path mv)"
-	LN="$(find_path ln)"
-	CAT="$(find_path cat)"
-	AWK="$(find_path gawk)"
-	GREP="$(find_path grep)"
-	FIND="$(find_path find)"
-	CHMOD="$(find_path chmod)"
-	TOUCH="$(find_path touch)"
-	ENV_UPDATE="$(find_path env-update)"
+	CP=$(find_path cp)
+	RM=$(find_path rm)
+	MV=$(find_path mv)
+	LN=$(find_path ln)
+	CAT=$(find_path cat)
+	AWK=$(find_path gawk)
+	GREP=$(find_path grep)
+	FIND=$(find_path find)
+	CHMOD=$(find_path chmod)
+	TOUCH=$(find_path touch)
+	PORTAGEQ=$(find_path portageq)
+	ENV_UPDATE=$(find_path env-update)
 }
 
 get_real_chost() {
 	[[ -n ${REAL_CHOST} ]] && return 0
 
-	export REAL_CHOST="$(env -u CHOST portageq envvar CHOST)"
+	export REAL_CHOST=$(env -u CHOST ${PORTAGEQ} envvar CHOST)
 
 	if [[ -z ${REAL_CHOST} ]] ; then
 		eerror "$0: Could not get portage CHOST!"
@@ -207,7 +208,7 @@ switch_profile() {
 		if [[ -x ${ref} ]] ; then
 			${CP} -f "${ROOT}/usr/lib/gcc-config/wrapper" \
 			         "${ROOT}/usr/bin/${x}"
-			touch -r "${ref}" "${ROOT}/usr/bin/${x}"
+			${TOUCH} -r "${ref}" "${ROOT}/usr/bin/${x}"
 
 			# Install 32bit and 64bit wrappers if need be
 			# This should probably get folded back into the wrapper ...
@@ -215,7 +216,7 @@ switch_profile() {
 				for bits in ${GCCBITS} ; do
 					echo "#!/bin/sh"$'\n'"exec ${x} -m${bits} \"\$@\"" \
 						> "${ROOT}/usr/bin/${x}${bits}"
-					chmod 755 "${ROOT}/usr/bin/${x}${bits}"
+					${CHMOD} 755 "${ROOT}/usr/bin/${x}${bits}"
 				done
 			fi
 		fi
@@ -237,8 +238,8 @@ switch_profile() {
 	if [[ -z ${PORTAGE_CALLER} ]] && ! is_cross_compiler ; then
 		for gcclib in gcc_s unwind ; do
 			if [[ -e ${ROOT}/${LDPATH}/lib${gcclib}.so ]] ; then
-				rm -f "${ROOT}"/lib/lib${gcclib}.so*
-				cp -a "${ROOT}/${LDPATH}"/lib${gcclib}.so* "${ROOT}"/lib/
+				${RM} -f "${ROOT}"/lib/lib${gcclib}.so*
+				${CP} -a "${ROOT}/${LDPATH}"/lib${gcclib}.so* "${ROOT}"/lib/
 			fi
 		done
 	fi
diff --git a/sys-devel/gcc-config/files/gcc-config-1.4.0 b/sys-devel/gcc-config/files/gcc-config-1.4.0
index 09525e575d50..4a503fb0f2f7 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.4.0
+++ b/sys-devel/gcc-config/files/gcc-config-1.4.0
@@ -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/gcc-config/files/gcc-config-1.4.0,v 1.10 2005/04/09 18:37:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v 1.11 2005/04/28 01:44:44 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -62,23 +62,24 @@ find_path() {
 cmd_setup() {
 	# Sourcing /etc/env.d/gcc/${CC_COMP} is going to mess up
 	# PATH among things...
-	CP="$(find_path cp)"
-	RM="$(find_path rm)"
-	MV="$(find_path mv)"
-	LN="$(find_path ln)"
-	CAT="$(find_path cat)"
-	AWK="$(find_path gawk)"
-	GREP="$(find_path grep)"
-	FIND="$(find_path find)"
-	CHMOD="$(find_path chmod)"
-	TOUCH="$(find_path touch)"
-	ENV_UPDATE="$(find_path env-update)"
+	CP=$(find_path cp)
+	RM=$(find_path rm)
+	MV=$(find_path mv)
+	LN=$(find_path ln)
+	CAT=$(find_path cat)
+	AWK=$(find_path gawk)
+	GREP=$(find_path grep)
+	FIND=$(find_path find)
+	CHMOD=$(find_path chmod)
+	TOUCH=$(find_path touch)
+	PORTAGEQ=$(find_path portageq)
+	ENV_UPDATE=$(find_path env-update)
 }
 
 get_real_chost() {
 	[[ -n ${REAL_CHOST} ]] && return 0
 
-	export REAL_CHOST="$(env -u CHOST portageq envvar CHOST)"
+	export REAL_CHOST=$(env -u CHOST ${PORTAGEQ} envvar CHOST)
 
 	if [[ -z ${REAL_CHOST} ]] ; then
 		eerror "$0: Could not get portage CHOST!"
@@ -100,10 +101,10 @@ if [[ -z \${ABI} ]]; then
 	export CFLAGS_custom="${3}"
 fi
 
-${2} "\${@}"
+exec ${2} "\${@}"
 EOF
 
-	chmod 755 ${1}
+	${CHMOD} 755 ${1}
 }
 
 switch_profile() {
@@ -227,13 +228,13 @@ switch_profile() {
 		if [[ -x ${ref} ]] ; then
 			${CP} -f "${WRAPPER}" \
 			         "${ROOT}/usr/bin/${x}"
-			touch -r "${ref}" "${ROOT}/usr/bin/${x}"
+			${TOUCH} -r "${ref}" "${ROOT}/usr/bin/${x}"
 
 			# Install 32bit and 64bit wrappers if need be
 			# This should probably get folded back into the wrapper ...
 			if [[ ${x:${#x}-3} == "gcc" ]] || [[ ${x:${#x}-3} == "g++" ]] ; then
 				for bits in ${GCCBITS} ; do
-					cp -f "${WRAPPER}" \
+					${CP} -f "${WRAPPER}" \
 						"${ROOT}/usr/bin/${x}${bits}"
 				done
 			fi
@@ -246,27 +247,27 @@ switch_profile() {
 		if [[ -f ${ref} ]]; then
 			# Don't use gccbits here... delete them if they exist.
 			[[ -f ${ROOT}/usr/bin/${CTARGET}-${x}32 ]] && \
-				rm -f ${ROOT}/usr/bin/${CTARGET}-${x}32
+				${RM} -f "${ROOT}"/usr/bin/${CTARGET}-${x}32
 			[[ -f ${ROOT}/usr/bin/${CTARGET}-${x}64 ]] && \
-				rm -f ${ROOT}/usr/bin/${CTARGET}-${x}64
+				${RM} -f "${ROOT}"/usr/bin/${CTARGET}-${x}64
 
 			${CP} -f ${WRAPPER} \
-				${ROOT}/usr/bin/${CTARGET}-${x}
-			${CHMOD} 755 ${ROOT}/usr/bin/${CTARGET}-${x}
-			touch -r ${ref} ${ROOT}/usr/bin/${CTARGET}-${x}
+				"${ROOT}"/usr/bin/${CTARGET}-${x}
+			${CHMOD} 755 "${ROOT}"/usr/bin/${CTARGET}-${x}
+			${TOUCH} -r "${ref}" "${ROOT}"/usr/bin/${CTARGET}-${x}
 
 			local cctarget
 			for cctarget in ${FAKE_TARGETS}; do
-				local var="CFLAGS_"${cctarget//-/_}
+				local var="CFLAGS_${cctarget//-/_}"
 				if [[ ! -f ${GCC_ENV_D}/config-${cctarget} ]]; then
-					create_script_wrapper ${ROOT}/usr/bin/${cctarget}-${x} ${CTARGET}-${x} "${!var}"
-					touch -r ${ref} ${ROOT}/usr/bin/${cctarget}-${x}
+					create_script_wrapper "${ROOT}"/usr/bin/${cctarget}-${x} ${CTARGET}-${x} "${!var}"
+					${TOUCH} -r "${ref}" "${ROOT}"/usr/bin/${cctarget}-${x}
 				fi
 			done
 
 			if ! is_cross_compiler && [[ -n "${CFLAGS_default}" ]]; then
-				create_script_wrapper ${ROOT}/usr/bin/${x} ${CTARGET}-${x} "${CFLAGS_default}"
-				touch -r ${ref} ${ROOT}/usr/bin/${x}
+				create_script_wrapper "${ROOT}"/usr/bin/${x} ${CTARGET}-${x} "${CFLAGS_default}"
+				${TOUCH} -r "${ref}" "${ROOT}"/usr/bin/${x}
 			fi
 		fi
 	done
@@ -293,8 +294,8 @@ switch_profile() {
 			libdir="lib/$(${ROOT}/${GCC_BIN_PATH}/${CTARGET}-gcc ${multiarg} -print-multi-os-directory)"
 			for gcclib in gcc_s unwind ; do
 				if [[ -e ${ROOT}/${LDPATH}/${multildir}/lib${gcclib}.so ]]; then
-					rm -f "${ROOT}/${libdir}"/lib${gcclib}.so*
-					cp -a "${ROOT}/${LDPATH}"/${multilibdir}/lib${gcclib}.so* "${ROOT}/${libdir}"/
+					${RM} -f "${ROOT}/${libdir}"/lib${gcclib}.so*
+					${CP} -a "${ROOT}/${LDPATH}"/${multilibdir}/lib${gcclib}.so* "${ROOT}/${libdir}"/
 				fi
 			done
 		done