Changeset 15537d5

Timestamp:

04/28/2006 04:53:14 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

041bc01

Parents:

d9a53e0

Message:

Removed unneeded true commands.

Files:

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

CLFS/master.sh

@@ -132 +132 @@
     # If $vrs isn't empty, we've got a package...
     #
-    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*" &&  echo -e '\ttrue' >> $MKFILE.tmp
+    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
     #
     wrt_run_as_su "${this_script}" "${file}"
@@ -184 +184 @@
     # Insert instructions for unpacking the package and to set the PKGDIR variable.
     #
-    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*" && echo -e '\ttrue' >> $MKFILE.tmp
+    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
     #
     wrt_run_as_su "${this_script}" "${file}"
@@ -255 +255 @@
     # Insert instructions for unpacking the package and changing directories
     #
-    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*" &&  echo -e '\ttrue' >> $MKFILE.tmp
+    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
     #
     # Select a script execution method
@@ -323 +323 @@
     if [ "$vrs" != "" ] ; then
       case $this_script in
-        *util-linux)    wrt_unpack  "$name-$vrs.tar.*"
-                        echo -e '\ttrue' >> $MKFILE.tmp
-            ;;
-        *)              wrt_unpack2 "$name-$vrs.tar.*"
-            ;;
+        *util-linux)    wrt_unpack  "$name-$vrs.tar.*"  ;;
+        *)              wrt_unpack2 "$name-$vrs.tar.*"  ;;
       esac
     fi

HLFS/master.sh

@@ -236 +236 @@
     case $this_script in
       *binutils* )  # Dump the path to sources directory for later removal
-        echo -e '\techo "$(MOUNT_PT)$(SRC)/$$ROOT" >> sources-dir' >> $MKFILE.tmp
+(
+cat << EOF
+        @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
+        echo "\$(MOUNT_PT)\$(SRC)/\$\$ROOT" >> sources-dir
+EOF
+) >> $MKFILE.tmp
         ;;
       *adjusting* )  # For the Adjusting phase we must to cd to the binutils-build directory.
         echo -e '\t@echo "export PKGDIR=$(MOUNT_PT)$(SRC)/binutils-build" > envars' >> $MKFILE.tmp
-        ;;
-      * )  # Everything else, add a true statment so we don't confuse make
-        echo -e '\ttrue' >> $MKFILE.tmp
         ;;
     esac

LFS/master.sh

@@ -113 +113 @@
       # Insert instructions for unpacking the package and to set the PKGDIR variable.
       wrt_unpack "$FILE"
-      echo -e '\ttrue' >> $MKFILE.tmp
     fi
 

common/common-functions

@@ -217 +217 @@
         @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
         echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\
-        chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\
+        chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT
 EOF
 ) >> $MKFILE.tmp