Changeset ab7bac5 for common

Timestamp:

05/27/2006 09:22:42 PM (18 years ago)

Author:

Jeremy Huntwork <jhuntwork@…>

Branches:

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

Children:

b7faa5a

Parents:

f358747

Message:

Added instructions to always remove source and -build directories before running specific package commands

File:

• common/common-functions (modified) (3 diffs)

common/common-functions

@@ -212 +212 @@
 #----------------------------------#
   local FILE=$1
+  local file=$2
 (
 cat << EOF
@@ -364 +365 @@
 (
 cat << EOF
-        @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
-        rm -r \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\
-        if [ -e \$(MOUNT_PT)\$(SRC)/$name-build ]; then \\
+        @if [ -f /tmp/unpacked ] ; then \\
+                ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
+                if [ "x" != "x\$\$ROOT" ] ; then rm -r \$(MOUNT_PT)\$(SRC)/\$\$ROOT; fi; \\
+        fi;
+        @if [ -e \$(MOUNT_PT)\$(SRC)/$name-build ]; then \\
                 rm -r \$(MOUNT_PT)\$(SRC)/$name-build; \\
         fi;
@@ -380 +383 @@
 (
 cat << EOF
-        @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
-        rm -r \$(SRC)/\$\$ROOT && \\
-        if [ -e \$(SRC)/$name-build ]; then \\
+        @if [ -f /tmp/unpacked ] ; then \\
+                ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
+                if [ "x" != "x\$\$ROOT" ] ; then rm -r \$(SRC)/\$\$ROOT; fi; \\
+        fi;
+        @if [ -e \$(SRC)/$name-build ]; then \\
                 rm -r \$(SRC)/$name-build; \\
         fi;