r2689 - in dists/trunk/live-helper: docs helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-08-04 19:13:43 +0000 (Sat, 04 Aug 2007)
New Revision: 2689

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_source_debian
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-08-04 19:09:23 UTC (rev 2688)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-08-04 19:13:43 UTC (rev 2689)
@@ -18,6 +18,8 @@
 	  - Added argument handling.
 	* helpers/lh_losetup:
 	  - Simplified and corrected to make it actually work.
+	* helpers/lh_source:
+	  - Not using 'echo -e' anymore.
 	* helpers/make-live:
 	  - Replaced with a dummy: make-live is deprecated now, use lh_config
 	    and lh_build instead.

Modified: dists/trunk/live-helper/helpers/lh_source_debian
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_debian	2007-08-04 19:09:23 UTC (rev 2688)
+++ dists/trunk/live-helper/helpers/lh_source_debian	2007-08-04 19:13:43 UTC (rev 2689)
@@ -59,9 +59,9 @@
 
 # Download sources
 Chroot "dpkg --get-selections" | awk '{ print $1 }' > chroot/root/dpkg-selection.txt
-echo "${LH_BOOTLOADER}" >> chroot/root/dpkg-selection.txt
 
 cat >> chroot/root/dpkg-selection.txt << EOF
+${LH_BOOTLOADER}
 live-helper
 ${LH_INITRAMFS}
 dosfstools
@@ -73,11 +73,18 @@
 
 case "${LH_ARCHITECTURE}" in
 	amd64|i386)
-		echo -e "${LH_MEMTEST}\nmtools\nsyslinux\ngrub" >> chroot/root/dpkg-selection.txt
+
+cat >> chroot/root/dpkg-selection.txt << EOF
+${LH_MEMTEST}
+mtools
+syslinux
+grub
+EOF
+
 		;;
 
 	powerpc)
-		echo -e "yaboot" >> chroot/root/dpkg-selection.txt
+		echo "yaboot" >> chroot/root/dpkg-selection.txt
 		;;
 esac