[gentoo-commits] proj/catalyst:master commit in: targets/support/

["Richard Farina" <zerochaos@gentoo.org>]

commit:     b2473eff92e64a13f87c1ba3c0628e3a7a75b5a3
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 03:45:31 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 03:45:31 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b2473eff

USE=${USE} gets parsed in bash instead of in make.conf, \${USE} prevents the expansion until it is already inside make.conf

 targets/support/chroot-functions.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 253eee2..4506eef 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -172,12 +172,12 @@ setup_pkgmgr(){
 	# Use --update or portage might just waste time/cycles and reinstall the same version.
 	# Use --newuse to make sure it rebuilds with any changed use flags.
 	if [ -n "$1" ];then
-		echo "Adding USE=\"${USE} $1\" to make.conf for portage build"
-		[ -e "${clst_make_conf}" ] && echo "USE=\"${USE} $1\"" >> "${clst_make_conf}"
+		echo "Adding USE=\"\${USE} $1\" to make.conf for portage build"
+		[ -e "${clst_make_conf}" ] && echo "USE=\"\${USE} $1\"" >> "${clst_make_conf}"
 		run_merge --oneshot --update --newuse sys-apps/portage
-		sed -i "/USE=\"${USE} $1\"/d" "${clst_make_conf}"
+		sed -i "/USE=\"\${USE} $1\"/d" "${clst_make_conf}"
 	else
-		echo "Updating portage with USE=\"${USE}\""
+		echo "Updating portage with USE=\"\${USE}\""
 		run_merge --oneshot --update --newuse sys-apps/portage
 	fi
 }
@@ -270,7 +270,7 @@ run_merge() {
 	export CONFIG_PROTECT="-*"
 
 	# Set bindist USE flag if clst_BINDIST is set
-	[ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"${USE} bindist\"" >> ${clst_make_conf}
+	[ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\"" >> ${clst_make_conf}
 
 	if [ -n "${clst_VERBOSE}" ]
 	then