Changeset 63b2859 for jhalfs

Timestamp:

09/26/2005 10:36:40 PM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

0.2, 1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

c4cf6de

Parents:

409488e

Message:

Starting the move of some features to the XSL code.
First try to manage chapter05.

File:

• jhalfs (modified) (4 diffs)

jhalfs

@@ -2 +2 @@
 
 version="
-jhalfs 0.2
+jhalfs development
+
 Written by Jeremy Huntwork.
 Maintained by Manuel Canales Esparcia.
@@ -159 +160 @@
   lfs-$LFSVRS/index.xml >>$JHALFSDIR/$LOG 2>&1
 
-  # Move the text files out from the chapter directories, and dump them
-  # all into the 'commands' directory.
-  cd commands
-  find ./* -xtype f -exec mv '{}' . \;
-  find ./* -maxdepth 0 -xtype d -exec rm -rf '{}' \;
-
-  # Remove all the blank lines from the commands
-  for i in $JHALFSDIR/commands/* ; do
-    sed -i '/^$/d' $i
-  done
-
   # Grab the patches and package names.
   cd $JHALFSDIR
@@ -264 +254 @@
   >$MKFILE.tmp
 
-  for i in * ; do
-  # First append each name of the command files to a list (this will become
+  for file in chapter0{4,5}/* ; do
+  # Keep the script file name
+  i=`basename $file`
+
+  # First append each name of the script files to a list (this will become
   # the names of the targets in the Makefile
   list="$list $i"
@@ -294 +287 @@
   fi
 
-  # Drop in the actual commands that were parsed from the book
-  # These seds add an extra $ to each variable so make doesn't break,
-  # add tabs to the beginning of each line, and add ' && \' to the end
-  # of each line except for those that end in '\'.
-  cat $i | sed -e 's:\$:&&:g' -e 's:^:\t:' -e 's:[^\\]$:& \&\& \\:' >> $MKFILE.tmp
-  # This sed removes the ' && \' from the last command of each target
-  sed -i '$s: \&\& \\::' $MKFILE.tmp
+#   # Drop in the actual commands that were parsed from the book
+#   # These seds add an extra $ to each variable so make doesn't break,
+#   # add tabs to the beginning of each line, and add ' && \' to the end
+#   # of each line except for those that end in '\'.
+#   cat $i | sed -e 's:\$:&&:g' -e 's:^:\t:' -e 's:[^\\]$:& \&\& \\:' >> $MKFILE.tmp
+#   # This sed removes the ' && \' from the last command of each target
+#   sed -i '$s: \&\& \\::' $MKFILE.tmp
+
+  # Run the script
+  echo -e "\tsu - lfs -c \"/bin/bash $file\"" >> $MKFILE.tmp
 
   # Include a touch of the target name so make can check if it's already been made.