Changeset 7eb9402

Timestamp:

07/04/2006 02:02:48 AM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

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

Children:

7d1f862

Parents:

483ab89

Message:

The never ending story of cleaning up CLFS scripts..

Files:

• CLFS/master.sh (modified) (4 diffs)
• common/common-functions (modified) (1 diff)

CLFS/master.sh

@@ -443 +443 @@
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    wrt_target "${this_script}" "$PREV"
+    wrt_target_boot "${this_script}" "$PREV"
     #
     wrt_unpack3 "$pkg_tarball"
@@ -648 +648 @@
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    wrt_target "${this_script}${N}" "$PREV"
+    wrt_target_boot "${this_script}${N}" "$PREV"
 
     # If $pkg_tarball isn't empty, we've got a package...
@@ -786 +786 @@
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    wrt_target "${this_script}" "$PREV"
+    wrt_target_boot "${this_script}" "$PREV"
     #
     # If $pkg_tarball isn't empty, we've got a package...
@@ -927 +927 @@
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    wrt_target "${this_script}" "$PREV"
+    wrt_target_boot "${this_script}" "$PREV"
     #
     # If $pkg_tarball isn't empty, we've got a package...

common/common-functions

@@ -204 +204 @@
         @./progress_bar.sh \$@ &
         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >logs/$LOGFILE
+EOF
+) >> $MKFILE.tmp
+}
+
+
+#----------------------------------#
+wrt_target_boot() {                # Create target and initialize log file
+#----------------------------------#
+  local i=$1
+  local PREV=$2
+  case $i in
+    iteration* ) local LOGFILE=$this_script.log ;;
+             * ) local LOGFILE=$this_script ;;
+  esac
+(
+cat << EOF
+
+$i:  $PREV
+        @\$(call echo_message, Building)
+        @./progress_bar.sh \$@ &
+        @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=${SCRIPT_ROOT}\`\n" >logs/$LOGFILE
 EOF
 ) >> $MKFILE.tmp