Changeset abc8b27 for LFS/master.sh

Timestamp:

08/29/2014 04:43:10 PM (10 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

9622581

Parents:

1f25a75

Message:

Change the command to create the CHROOT$i variables so that it looks better.
Thanks to "amakarov" for the patch.

File:

• LFS/master.sh (modified) (1 diff)

LFS/master.sh

@@ -434 +434 @@
   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`