Changeset b7faa5a for common/common-functions

Timestamp:

05/27/2006 10:51:06 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:

a858a78

Parents:

ab7bac5

Message:

Reverting r2729 until a better solution is found

File:

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

common/common-functions

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