Changeset 742 for locker/sbin

Timestamp:

May 3, 2008, 9:25:20 PM (16 years ago)

Author:

njess

Message:

misc. uncommitted changes from April from acrefoot

File:

• locker/sbin/build-update (modified) (4 diffs)

locker/sbin/build-update

@@ -90 +90 @@
 
 open (SCRIPT, ">", catfile($outdir, "update")) or die "Couldn't write update: $!";
-printf SCRIPT <<'EOF', catfile("/mit/scripts/deploy/", $old), catfile("/mit/scripts/deploy/", $new);
+printf SCRIPT <<'EOF', catfile("/afs/athena.mit.edu/contrib/scripts/deploy/", $old), catfile("/afs/athena.mit.edu/contrib/scripts/deploy/", $new);
 #!/bin/bash
 set -e -o noclobber
 
-die () { echo "$1" >&2; exit 1; }
+die () { echo "$1" >&2; rm .scripts-security-upd-lock; exit 1; }
 
 patchdir=$(dirname "$0")
@@ -100 +100 @@
 >.scripts-security-upd-lock || die "error: Unable to obtain update lock."
 
-packages=$(tail -n 1 .scripts-version)
+packages=$(tail -1 .scripts-version)
 
 echo "[$PWD] begin dry run"
@@ -116 +116 @@
 
 [ "$found" = "yes" ] || die "error: Correct version not found."
-xargs -n1 test ! -e <"$patchdir/oldfiles.absent" || die "error: Conflicting files exist."
-md5sum -c "$patchdir/check.md5" || die "error: MD5 check failed."
+[ -s "$patchdir/oldfiles.absent" ] && (xargs -n1 test ! -e <"$patchdir/oldfiles.absent" || die "error: Conflicting files exist." )
+[ -s "$patchdir/check.md5" ] && (md5sum -c "$patchdir/check.md5" || die "error: MD5 check failed.")
 patch -stN --dry-run --no-backup-if-mismatch -p2 <"$patchdir/update.diff" || die "error: Patch dry run failed."
 
@@ -126 +126 @@
 xargs rm -f <"$patchdir/files.delete"
 tar -xzf "$patchdir/newfiles.tar.gz"
+[ -e "$patchdir/extra/postpatch.sh" ] && . "$patchdir/extra/postpatch.sh"
 (
     cat .scripts-version.old