From 55c1307af1cb1d525f6a603b769105948a906d95 Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Sat, 16 Dec 2023 11:59:15 +0100 Subject: [PATCH] /run/nb/nb-update.lock --- bin/nb-update | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/bin/nb-update b/bin/nb-update index 17e0c5f3..36d830e4 100755 --- 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" -- 2.47.3