bin/nb-update

diff --git a/bin/nb-update b/bin/nb-update
index c5f57447d4030ff8148937ef3c4c6e4ba9a5fb0c..17e0c5f36c08c6decec1d43066d11dde48d93d4a 100755 (executable)
--- a/bin/nb-update
+++ b/bin/nb-update
@@ -6,12 +6,10 @@
 #
 #####################################################################
 NAME="$(basename "${0}")"
-if [ "$UID" != "0" ] ; then
-       echo "$NAME: please login as root." 1>&2
-       exit 1
-fi
 [ -e "/run/$NAME.no" ] && exit 
 TMP="/tmp/$NAME.$$"
+LOCK="/run/nb/$NAME.lock"
+[ -z "$UID" ] && UID="$(id -u)"
 CLEANUP=0
 [ "$1" = "-cleanup" ] && CLEANUP=1
 
@@ -20,10 +18,21 @@ CLEANUP=0
 # Requirments
 #
 #####################################################################
-. $(dirname "$0")/../etc/profile || exit 1; [ -z "$NB_ROOT" ] && exit
+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
+fi
+. $(dirname "$0")/../etc/profile || bye 1; [ -z "$NB_ROOT" ] && bye
 if ! which git > /dev/null; then
        echo "$NAME: can't find git!" 1>&2
-       exit 1
+       bye 1
 fi
 ex=0
 
@@ -112,7 +121,7 @@ for dir in $(nb_repos); do
        preff="git.$dir"
 
        # include extra scripts
-       ! [ -r "$NB_ROOT/lib/$NAME/repo.sh" ] || . "$NB_ROOT/lib/$NAME/repo.sh" || exit
+       ! [ -r "$NB_ROOT/lib/$NAME/repo.sh" ] || . "$NB_ROOT/lib/$NAME/repo.sh" || bye
 
        #
        # Build command
@@ -190,8 +199,6 @@ done
 # Update infos
 #
 if [ "$CLEANUP" = "1" ]; then
-       # NB 01.05.23 rm -f /tmp/$NAME.infos /tmp/$NAME.check /run/$NAME-nb_post_sys_infos.lock
-       # NB 01.05.23: TODEL  
        rm -f \
                /run/$NAME-nb_api_post_hosts_infos.lock \
                /run/nb-sys.csv* \
@@ -200,10 +207,13 @@ if [ "$CLEANUP" = "1" ]; then
 fi
 
 # Delete old lock
-find /run/nb/$NAME.lock -mmin +$((60*24*1)) -exec rm {} \; >/dev/null 2>&1
-if [ ! -e /run/nb/$NAME.lock ]
+#sys_info_lock="/run/nb/$NAME.lock"
+#find $sys_info_lock -mmin +$((60*24*1)) -exec rm {} \; >/dev/null 2>&1
+sys_info_lock="/run/nb/$NAME-post.lock"
+find $sys_info_lock -mmin +$((60*24*1)) -exec rm {} \; >/dev/null 2>&1
+if [ ! -e $sys_info_lock ]
 then
-       touch /run/nb/$NAME.lock
+       touch $sys_info_lock
 
        echo ">Post sys infos"
        nb_api_post_hosts_infos | tee /run/nb/sys.csv.tmp | sed -e 's/^/  /; s/'$'\t''/: /'
@@ -221,4 +231,4 @@ if [ "$ex" = "0" ]; then
 else
        printf ">ERR\n"
 fi
-exit $ex
+bye $ex