From 897f0de477addfc4cf14dc6105174bb726d29b9d Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Thu, 21 Nov 2024 15:36:40 +0000 Subject: [PATCH] bin/nb-update --- bin/nb-repo-update | 3 +++ bin/nb-update | 2 +- lib/nb-update/repo.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/nb-repo-update b/bin/nb-repo-update index ccafd83f..f9b27257 100755 --- a/bin/nb-repo-update +++ b/bin/nb-repo-update @@ -98,6 +98,9 @@ trap "exec {F_INDENT1}>&-; exec {F_INDENT2}>&-; rm -f '$TMP'" EXIT #echo ${V:-2} #(date;false) >&$F_INDENT2; exit +# include extra scripts +#! [ -r "$NB_ROOT/lib/nb-update/repo.sh" ] || . "$NB_ROOT/lib/nb-update/repo.sh" || bye + #---------------------------------------------------------- # Git pull # diff --git a/bin/nb-update b/bin/nb-update index 3f28266b..602ab333 100755 --- a/bin/nb-update +++ b/bin/nb-update @@ -169,7 +169,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" || bye + #! [ -r "$NB_ROOT/lib/$NAME/repo.sh" ] || . "$NB_ROOT/lib/$NAME/repo.sh" || bye #exec {F_INDENT}> >(sed 's/^/ /') opt="" diff --git a/lib/nb-update/repo.sh b/lib/nb-update/repo.sh index ad150375..bd09bd3e 100644 --- a/lib/nb-update/repo.sh +++ b/lib/nb-update/repo.sh @@ -17,5 +17,5 @@ git_change_url "git@big:izideal" "git@git.nbdom.net:izideal.git" git_change_url "git@big:izideal.git" "git@git.nbdom.net:izideal.git" # NB 19.10.24: -git branch | awk '/^\* testing/{ex=1}END{exit ex}' && git checkout master +exec_user $user git branch | awk '/^\* testing/{ex=1}END{exit ex}' && exec_user $user git checkout master return 0 -- 2.47.3