Changeset 0ee43c8 for scripts/locker-update

Timestamp:

Apr 26, 2010, 7:49:27 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

a4b0572

Parents:

60fcd71

git-author:

David Benjamin <davidben@mit.edu> (04/24/10 17:11:44)

git-committer:

Nelson Elhage <nelhage@mit.edu> (04/26/10 19:49:27)

Message:

Unify the beta and non-beta code paths

File:

• scripts/locker-update (modified) (2 diffs)

scripts/locker-update

@@ -31 +31 @@
 test -n "$dryrun" && E=echo
 
+B=
+test -n "$beta" && B=-beta
+
 cd /mit/barnowl/arch/
 
@@ -42 +45 @@
     else
         echo "# $i"
-        if test -n "$beta"; then
-            $E ln -sf "../../common/bin/barnowl-beta" "$i/bin/barnowl-beta"
-            $E ln -sf "$NEWVERSION" "$i/bin/barnowl.real-beta"
-        else
-                # Sanity -- make sure the 'barnowl' symlink is correct.
-            $E ln -sf "../../common/bin/barnowl" "$i/bin/barnowl"
-            $E ln -sf "$NEWVERSION" "$i/bin/barnowl.real"
-        fi
+
+        # Sanity -- make sure the 'barnowl' symlink is correct.
+        $E ln -sf "../../common/bin/barnowl$B" "$i/bin/barnowl$B"
+        $E ln -sf "$NEWVERSION" "$i/bin/barnowl.real$B"
+
         $E ln -sf "zcrypt${NEWVERSION#barnowl}" "$i/bin/zcrypt"
     fi