From 78dc65cdbb8dc2e1391841071963b33470090031 Mon Sep 17 00:00:00 2001
From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Sun, 13 Oct 2024 09:44:00 +0200
Subject: [PATCH] bin/nb-repo-update

---
 bin/nb-repo-update | 9 ++++++---
 bin/nb-update      | 5 -----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/bin/nb-repo-update b/bin/nb-repo-update
index 590d8307..42f7ae1d 100755
--- a/bin/nb-repo-update
+++ b/bin/nb-repo-update
@@ -29,6 +29,7 @@ fi
 REPO_NAME="$(basename -s .git $(git remote get-url origin))"
 [ -n "$REPO_NAME" ] || exit
 
+TMP="/tmp/$NAME.$$"
 ################################################################################
 #
 # Functions
@@ -85,10 +86,13 @@ done
 # Main
 #
 #################################################################################
+printf '#!%s\n%s\n' "$(which sh)" 'ssh -o BatchMode=yes $@' > "$TMP" && chmod 755 "$TMP"
+export GIT_SSH="$TMP"
 exec {F_INDENT1}> >(sed 's/^/  /')
 exec {F_INDENT2}> >(sed -e 's/\r/\n/g' -e 's/^ *//' -e 's/^/    /')
-trap 'exec {F_INDENT1}>&-; exec {F_INDENT2}>&-;' EXIT
 
+trap "exec {F_INDENT1}>&-; exec {F_INDENT2}>&-; rm -f '$TMP'" EXIT
+#cat $TMP; exit
 
 #V=1
 #echo ${V:-2}
@@ -98,7 +102,7 @@ trap 'exec {F_INDENT1}>&-; exec {F_INDENT2}>&-;' EXIT
 # Git pull 
 #
 #REPO_BRANCH=$(git branch --show-current) || exit
-REPO_BRANCH=$(awk 'BEGIN{ex=1}/^\*/{print $2;ex=0}END{exit ex}') || exit
+REPO_BRANCH=$(git branch|awk 'BEGIN{ex=1}/^\*/{print $2;ex=0}END{exit ex}') || exit
 [ -n "$REPO_BRANCH" ] || exit
 
 if [ -r ~/.ssh/agent.sh ]
@@ -108,7 +112,6 @@ fi
 #git_conn_check || exit
 
 echo ">Pull $REPO_NAME branch=$REPO_BRANCH user=$(whoami) path=$REPO_ROOT"
-
 git pull >&$F_INDENT1 || exit
 
 if [ "$CLEANUP" = "1" ]
diff --git a/bin/nb-update b/bin/nb-update
index 20f67b95..3f28266b 100755
--- a/bin/nb-update
+++ b/bin/nb-update
@@ -7,7 +7,6 @@
 #####################################################################
 NAME="$(basename "${0}")"
 [ -e "/run/$NAME.no" ] && exit 
-TMP="/tmp/$NAME.$$"
 LOCK="/run/nb/$NAME.lock"
 [ -z "$UID" ] && UID="$(id -u)"
 
@@ -95,9 +94,6 @@ else
 	exit 1
 fi
 
-printf '#!%s\n%s\n' `which sh` 'ssh -o BatchMode=yes $@' > "$TMP" && chmod 755 "$TMP"
-export GIT_SSH="$TMP"
-
 #####################################################################
 #
 # Repos
@@ -232,7 +228,6 @@ fi
 #####################################################################
 # End
 #
-rm -f "$TMP"
 echo
 if [ "$ex" = "0" ]; then
 	printf ">OK\n"
-- 
2.47.3