From d99323430cf89e6566899483419f99453140c665 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 31 Oct 2023 14:34:37 +0100 Subject: make help more generic --- bin/extra/supd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/extra/supd') diff --git a/bin/extra/supd b/bin/extra/supd index 48638bd..e8eacd4 100755 --- a/bin/extra/supd +++ b/bin/extra/supd @@ -7,7 +7,7 @@ then >&2 cat <<-EOF usage: supd Update dirs in current dir - ls ~/projects | supd Update dirs read from stdin + ... | supd Update dirs read from stdin supd -h Show help EOF exit -- cgit v1.2.3 From 442fdac531a6b042a396eafc096811e46bc063ca Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 31 Oct 2023 17:38:44 +0100 Subject: check if git dir before doing anything --- bin/extra/supd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin/extra/supd') diff --git a/bin/extra/supd b/bin/extra/supd index e8eacd4..61ea144 100755 --- a/bin/extra/supd +++ b/bin/extra/supd @@ -17,9 +17,10 @@ fi for dir in $dirs do - printf '%s:' "$dir" | >&2 sed "s#$HOME#~#" ( cd "$dir" || return + git rev-parse > /dev/null 2>&1 || return + printf '%s:' "$dir" | >&2 sed "s#$HOME#~#" git "${1:-fetch}" > /dev/null 2>&1 && printf ' o' || printf ' x' -- cgit v1.2.3 From b7c4d89004f6c493fc0acdbf8b26cae1857b4eb1 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 1 Nov 2023 22:45:27 +0100 Subject: fix typo --- bin/extra/supd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/extra/supd') diff --git a/bin/extra/supd b/bin/extra/supd index 61ea144..9adfcf6 100755 --- a/bin/extra/supd +++ b/bin/extra/supd @@ -27,7 +27,7 @@ do # Show remote state printf '%s %s\n' "$(git status --short 2> /dev/null | awk 'NR==1 {print $1}')" "$(git branch -v 2>/dev/null | - awk -F '[][]' '/^\*/ {print $2}')" | - sed 's/ahead/↑ /;s/behind/↓ /;s/[^↓↑]*/ /g' + awk -F '[][]' '/^\*/ {print $2}' | + sed 's/ahead/↑ /;s/behind/↓ /;s/[^↓↑]*/ /g')" ) done -- cgit v1.2.3 From e00713823b3dbd52f7ea15b5d7f7371d78142e16 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 1 Nov 2023 22:45:41 +0100 Subject: exit if command failed --- bin/extra/supd | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'bin/extra/supd') diff --git a/bin/extra/supd b/bin/extra/supd index 9adfcf6..dba4910 100755 --- a/bin/extra/supd +++ b/bin/extra/supd @@ -19,11 +19,16 @@ for dir in $dirs do ( cd "$dir" || return + # is git dir git rev-parse > /dev/null 2>&1 || return printf '%s:' "$dir" | >&2 sed "s#$HOME#~#" - git "${1:-fetch}" > /dev/null 2>&1 && - printf ' o' || + if git "${1:-fetch}" > /dev/null 2>&1 + then + printf ' o' + else printf ' x' + return + fi # Show remote state printf '%s %s\n' "$(git status --short 2> /dev/null | awk 'NR==1 {print $1}')" "$(git branch -v 2>/dev/null | -- cgit v1.2.3 From 5265e4a51c9b76537f6c7766e5edbb1f20e56da4 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 1 Nov 2023 22:47:04 +0100 Subject: put status in braces --- bin/extra/supd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/extra/supd') diff --git a/bin/extra/supd b/bin/extra/supd index dba4910..2e1f968 100755 --- a/bin/extra/supd +++ b/bin/extra/supd @@ -30,8 +30,8 @@ do return fi # Show remote state - printf '%s %s\n' "$(git status --short 2> /dev/null | - awk 'NR==1 {print $1}')" "$(git branch -v 2>/dev/null | + printf ' %s %s\n' "$(git status --short 2> /dev/null | + awk 'NR==1 {print "(" $1 ")"}')" "$(git branch -v 2>/dev/null | awk -F '[][]' '/^\*/ {print $2}' | sed 's/ahead/↑ /;s/behind/↓ /;s/[^↓↑]*/ /g')" ) -- cgit v1.2.3 From 7ff4c5b211129724c451831cefadd55cb55293dd Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 1 Nov 2023 22:48:08 +0100 Subject: changed markup --- bin/extra/supd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bin/extra/supd') diff --git a/bin/extra/supd b/bin/extra/supd index 2e1f968..019dd51 100755 --- a/bin/extra/supd +++ b/bin/extra/supd @@ -21,16 +21,16 @@ do cd "$dir" || return # is git dir git rev-parse > /dev/null 2>&1 || return - printf '%s:' "$dir" | >&2 sed "s#$HOME#~#" + printf '%s: ' "$dir" | >&2 sed "s#$HOME#~#" if git "${1:-fetch}" > /dev/null 2>&1 then - printf ' o' + printf 'o' else - printf ' x' + printf 'x' return fi # Show remote state - printf ' %s %s\n' "$(git status --short 2> /dev/null | + printf ' %s%s\n' "$(git status --short 2> /dev/null | awk 'NR==1 {print "(" $1 ")"}')" "$(git branch -v 2>/dev/null | awk -F '[][]' '/^\*/ {print $2}' | sed 's/ahead/↑ /;s/behind/↓ /;s/[^↓↑]*/ /g')" -- cgit v1.2.3 From b9f5c4e8dcdd209933aa202444a40c1b0d9e542f Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 1 Nov 2023 22:49:22 +0100 Subject: fixed markup --- bin/extra/supd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/extra/supd') diff --git a/bin/extra/supd b/bin/extra/supd index 019dd51..c7e4e8c 100755 --- a/bin/extra/supd +++ b/bin/extra/supd @@ -26,7 +26,7 @@ do then printf 'o' else - printf 'x' + printf 'x\n' return fi # Show remote state -- cgit v1.2.3 From d9a8d6f268a3c0bbf9e24da0737d4af9abbadec0 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 3 Nov 2023 17:42:50 +0100 Subject: still parse status info if the command failed --- bin/extra/supd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'bin/extra/supd') diff --git a/bin/extra/supd b/bin/extra/supd index c7e4e8c..9a5ce0c 100755 --- a/bin/extra/supd +++ b/bin/extra/supd @@ -20,19 +20,19 @@ do ( cd "$dir" || return # is git dir - git rev-parse > /dev/null 2>&1 || return - printf '%s: ' "$dir" | >&2 sed "s#$HOME#~#" - if git "${1:-fetch}" > /dev/null 2>&1 + if ! git rev-parse > /dev/null 2>&1 then - printf 'o' - else printf 'x\n' - return + exit fi + printf '%s: ' "$dir" | >&2 sed "s#$HOME#~#" + git "${1:-fetch}" > /dev/null 2>&1 && + printf 'o' || + printf 'x' # Show remote state printf ' %s%s\n' "$(git status --short 2> /dev/null | awk 'NR==1 {print "(" $1 ")"}')" "$(git branch -v 2>/dev/null | awk -F '[][]' '/^\*/ {print $2}' | - sed 's/ahead/↑ /;s/behind/↓ /;s/[^↓↑]*/ /g')" + sed 's/ahead/↑ /;s/behind/↓ /;s/[^↓↑]*//g')" ) done -- cgit v1.2.3