commit: 487f1e94217c6a64b770a3f32d942eb613159be0
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 03:36:04 2015 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 03:36:04 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=487f1e94
fix USE="$USE $1" showing up in make.conf
targets/support/chroot-functions.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/targets/support/chroot-functions.sh
b/targets/support/chroot-functions.sh
index 95904b3..253eee2 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
}