From: Nicolas Boisselier Date: Wed, 3 Jan 2018 18:39:52 +0000 (+0000) Subject: bin/nb-update X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=0dbf73c789c19dd1b63305018738964bafc1e81e;p=nb.git bin/nb-update --- diff --git a/bin/nb-update b/bin/nb-update index aeb4d953..f88f8724 100755 --- a/bin/nb-update +++ b/bin/nb-update @@ -37,6 +37,9 @@ for repo in $(nb_repos); do [ -z "$name" ] && continue #name="$(basename $repo)" + branch=$(git_branch) || continue + [ -z "$branch" ] && continue + # # Get user # @@ -54,7 +57,7 @@ for repo in $(nb_repos); do # # Pull # - echo ">Pull $name branch=$(git_branch) user=$user path=$repo" + echo ">Pull $name branch=$branch user=$user path=$repo" cmd="${cmd}GIT_SSH=$GIT_SSH cd \"$repo\" && git pull" [ "$CLEANUP" = "1" ] && cmd="$cmd && git gc" @@ -89,8 +92,10 @@ for repo in $(nb_repos); do fi echo - nb_api_post_host_info key=repo.$name.exit_code val=$ex - nb_api_post_host_info key=repo.$name.last_commit val=$(cd "$repo" && git log | head -1 | awk '/^commit/ { print $2; exit; }') + key="repo.$name.$branch" + nb_api_post_host_info "key=${key}.path" "val=$repo" + nb_api_post_host_info "key=${key}.exit_code" "val=$ex" + nb_api_post_host_info "key=${key}.last_commit" val=$(cd "$repo" && git log | head -1 | awk '/^commit/ { print $2; exit; }') done