Ticket #1692: lfs-master.sh.patch

LFS/master.sh

@@ -1 +1 @@
 #!/bin/bash
 
-# $Id$
+# $Id: master.sh 3782 2014-01-28 13:29:06Z pierre $
 
 ###################################
 ###         FUNCTIONS           ###
@@ -433 +433 @@
   i=1
   for file in ../chroot-scripts/*chroot* ; do
     chroot=`cat $file | \
-            sed -e "s@chroot@$CHROOT_LOC@" \
-                -e '/#!\/bin\/bash/d' \
-                -e 's@ \\\@ @g' | \
-            tr -d '\n' | \
-            sed -e 's/  */ /g' \
+            perl -pe 's|\\\\\n||g' | \
+            tr -s [:space:] | \
+            grep chroot | \
+            sed -e "s|chroot|$CHROOT_LOC|" \
                 -e 's|\\$|&&|g' \
-                -e 's|exit||g' \
-                -e 's|"$$LFS"|$(MOUNT_PT)|' \
-                -e 's|set -e||' \
-                -e 's|set +h||'`
+                -e 's|"$$LFS"|$(MOUNT_PT)|'`
     echo -e "CHROOT$i= $chroot\n" >> $MKFILE
     i=`expr $i + 1`
   done