/run/nb/nb-update.lock

diff --git a/bin/nb-update b/bin/nb-update
index 17e0c5f36c08c6decec1d43066d11dde48d93d4a..36d830e47c697a4413a3f9bd99d4e88149a0bca4 100755 (executable)
--- a/bin/nb-update
+++ b/bin/nb-update
@@ -18,24 +18,30 @@ CLEANUP=0
 # Requirments
 #
 #####################################################################
-bye() { rm -f "$LOCK"; exit ${1:-$ex}; }
-find "$LOCK" -mmin +60 -exec rm {} \; >/dev/null 2>&1
-# NB 11.12.23 if [ ! -e $"$LOCK" ]
-# NB 11.12.23 then
-       # NB 11.12.23 echo $$> "$LOCK"
-# NB 11.12.23 fi
-
 if [ "$UID" != "0" ] ; then
        echo "$NAME: please login as root." 1>&2
-       bye 1
+       exit 1
 fi
-. $(dirname "$0")/../etc/profile || bye 1; [ -z "$NB_ROOT" ] && bye
+
+. $(dirname "$0")/../etc/profile || exit 1; [ -z "$NB_ROOT" ] && exit
+
 if ! which git > /dev/null; then
        echo "$NAME: can't find git!" 1>&2
-       bye 1
+       exit 1
 fi
+
 ex=0
 
+bye() { rm -f "$LOCK"; exit ${1:-$ex}; }
+find "$LOCK" -mmin +60 -exec rm {} \; >/dev/null 2>&1
+if [ ! -e $"$LOCK" ]
+then
+       echo $$ > "$LOCK"
+else
+       echo "$NAME: lock file already exists: $LOCK" 1>&2
+       exit 1
+fi
+
 printf '#!%s\n%s\n' `which sh` 'ssh -o BatchMode=yes $@' > "$TMP" && chmod 755 "$TMP"
 export GIT_SSH="$TMP"