diff --git a/usr/local/bin/sh.zio.backup b/usr/local/bin/sh.zio.backup index b7ad3c4..035dda0 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="$(echo "$3" | sed -r "s/\x1B\[[0-9;]*[JKmsu]//g")" + message="$3" log_path="$4" notify_prog="/usr/local/bin/sh.zio.notify" @@ -185,6 +185,8 @@ 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)" \ @@ -320,11 +322,7 @@ function print_time() { [[ $m != "0" ]] && output+=" $m $m_string" [[ $s != "0" ]] && output+=" $s $s_string" - if [[ "$output" == "" ]]; then - echo "0 seconds" - else - echo $output - fi + echo $output } function start_service() {