[gentoo-commits] catalyst r1336 - in trunk: . targets/stage1 targets/support

[Chris Gianelloni (wolf31o2)]

Author: wolf31o2
Date: 2008-02-28 04:44:16 +0000 (Thu, 28 Feb 2008)
New Revision: 1336

Modified:
   trunk/ChangeLog
   trunk/targets/stage1/stage1-chroot.sh
   trunk/targets/support/kmerge.sh
Log:
OK, we have to escape our quotes, rather than use single quotes, or we don't evaluate the variables properly.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-02-28 04:33:14 UTC (rev 1335)
+++ trunk/ChangeLog	2008-02-28 04:44:16 UTC (rev 1336)
@@ -2,6 +2,11 @@
 # $Id: $
 
   28 Feb 2008; Chris Gianelloni <wolf31o2@g.o>
+  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 <wolf31o2@g.o>
   targets/stage1/stage1-chroot.sh, targets/support/chroot-functions.sh,
   targets/support/kmerge.sh:
   Fixing echo/sed for make.conf writing.

Modified: trunk/targets/stage1/stage1-chroot.sh
===================================================================
--- trunk/targets/stage1/stage1-chroot.sh	2008-02-28 04:33:14 UTC (rev 1335)
+++ trunk/targets/stage1/stage1-chroot.sh	2008-02-28 04:44:16 UTC (rev 1336)
@@ -28,7 +28,7 @@
 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

Modified: trunk/targets/support/kmerge.sh
===================================================================
--- trunk/targets/support/kmerge.sh	2008-02-28 04:33:14 UTC (rev 1335)
+++ trunk/targets/support/kmerge.sh	2008-02-28 04:44:16 UTC (rev 1336)
@@ -184,8 +184,8 @@
 	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

-- 
gentoo-commits@l.g.o mailing list