Changeset 67dd774 for scripts

Timestamp:

May 3, 2009, 8:16:27 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

de9edab

Parents:

120f16d

Message:

locker-build: Two small fixes

First, correctly propagate errors out of the subshell that we do the
build in. Second, if a dry-run build fails, drop to a shell anyways to
let me inspect what went wrong.

File:

• scripts/locker-build (modified) (3 diffs)

scripts/locker-build

@@ -14 +14 @@
 
 die() {
-      echo "$@" 2>&1;
-      exit 1;
+    echo "$@" 2>&1;
+    if [ -n "$TMPDIR" ]; then
+        if [ -n "$DRYRUN" ]; then
+            echo "Dropping to a shell to investigate...";
+            $SHELL
+        fi
+    fi
+    exit 1;
 }
 
@@ -70 +76 @@
 exittrap() { rm -rf "$TMPDIR"; }
 
-$TAR -C "$TMPDIR" -xzvf "$SRC_TGZ" || die "Unable to untar"
+$TAR -C "$TMPDIR" -xzf "$SRC_TGZ" || die "Unable to untar"
 
 (
@@ -107 +113 @@
 )
 
+if [ "$?" -ne 0 ]; then
+    exit "$?"
+fi
+
 if [ -n "$OUT_TGZ" ]; then
     $TAR -C "$TMPDIR/"*/tgz -czvf "$OUT_TGZ" . || die "Make tarball failed"