From c7d32b84a8175b856c8a78e96413c9d186627d88 Mon Sep 17 00:00:00 2001 From: Ducky Date: Tue, 2 Apr 2024 01:06:45 +0100 Subject: [PATCH 1/2] sh.zio.notify: handle extreme edge-case --- usr/local/bin/sh.zio.backup | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr/local/bin/sh.zio.backup b/usr/local/bin/sh.zio.backup index 035dda0..4337456 100755 --- a/usr/local/bin/sh.zio.backup +++ b/usr/local/bin/sh.zio.backup @@ -322,7 +322,11 @@ function print_time() { [[ $m != "0" ]] && output+=" $m $m_string" [[ $s != "0" ]] && output+=" $s $s_string" - echo $output + if [[ "$output" == "" ]]; then + echo "0 seconds" + else + echo $output + fi } function start_service() { From 49a0fcdce44e45cf331c95768f132a70c5b3fa4c Mon Sep 17 00:00:00 2001 From: Ducky Date: Tue, 2 Apr 2024 01:06:57 +0100 Subject: [PATCH 2/2] revert 5d5c7b02a73fad78b8dd8138d0ac40f24b87b152 --- usr/local/bin/sh.zio.backup | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/usr/local/bin/sh.zio.backup b/usr/local/bin/sh.zio.backup index 4337456..b7ad3c4 100755 --- a/usr/local/bin/sh.zio.backup +++ b/usr/local/bin/sh.zio.backup @@ -157,7 +157,7 @@ function invoke_script() { function trigger_notify() { level="$1" title="$2" - message="$3" + message="$(echo "$3" | sed -r "s/\x1B\[[0-9;]*[JKmsu]//g")" log_path="$4" notify_prog="/usr/local/bin/sh.zio.notify" @@ -185,8 +185,6 @@ function trigger_notify() { --message "$message" \ --title "$title" else - message="$(echo "$3" | sed -r "s/\x1B\[[0-9;]*[JKmsu]//g")" - "$notify_prog" \ --file "$log_path" \ --invoked-by "$(basename $me_filename)" \