From 2347f26c1cb03c95ada9e701864e84cf552109f0 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 28 Feb 2008 04:44:16 +0000 Subject: [PATCH] OK, we have to escape our quotes, rather than use single quotes, or we don't evaluate the variables properly. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1336 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 +++++ targets/stage1/stage1-chroot.sh | 2 +- targets/support/kmerge.sh | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3871185d..8e035a89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 28 Feb 2008; Chris Gianelloni + targets/stage1/stage1-chroot.sh, targets/support/kmerge.sh: + OK, we have to escape our quotes, rather than use single quotes, or we don't + evaluate the variables properly. + 28 Feb 2008; Chris Gianelloni targets/stage1/stage1-chroot.sh, targets/support/chroot-functions.sh, targets/support/kmerge.sh: diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 170fff88..151a3637 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -28,7 +28,7 @@ run_merge "--oneshot --nodeps virtual/baselayout" sed -i '/USE="${USE} -build"/d' /etc/make.conf [ -e /etc/make.conf ] && \ - echo 'USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}"' >> /etc/make.conf + echo "USE=\"-* bindist build ${STAGE1_USE} ${HOSTUSE}\"" >> /etc/make.conf run_merge "--noreplace --oneshot --newuse ${clst_buildpkgs}" sed -i '/USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}"/d' \ /etc/make.conf diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 5ec25179..96eeb061 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -184,8 +184,8 @@ then fi fi -[ -e /etc/make.conf ] && echo 'USE="${USE} ${clst_kernel_use} symlink build"' \ - >> /etc/make.conf +[ -e /etc/make.conf ] && \ + echo \"USE="${USE} ${clst_kernel_use} symlink build\"" >> /etc/make.conf if [ -n "${clst_KERNCACHE}" ] then -- 2.26.2