2
0
Fork 0

Compare commits

..

No commits in common. "49a0fcdce44e45cf331c95768f132a70c5b3fa4c" and "d455e58b1a7e6c8ba45c9f7657500c6286048745" have entirely different histories.

1 changed files with 4 additions and 6 deletions

View File

@ -157,7 +157,7 @@ function invoke_script() {
function trigger_notify() { function trigger_notify() {
level="$1" level="$1"
title="$2" title="$2"
message="$(echo "$3" | sed -r "s/\x1B\[[0-9;]*[JKmsu]//g")" message="$3"
log_path="$4" log_path="$4"
notify_prog="/usr/local/bin/sh.zio.notify" notify_prog="/usr/local/bin/sh.zio.notify"
@ -185,6 +185,8 @@ function trigger_notify() {
--message "$message" \ --message "$message" \
--title "$title" --title "$title"
else else
message="$(echo "$3" | sed -r "s/\x1B\[[0-9;]*[JKmsu]//g")"
"$notify_prog" \ "$notify_prog" \
--file "$log_path" \ --file "$log_path" \
--invoked-by "$(basename $me_filename)" \ --invoked-by "$(basename $me_filename)" \
@ -320,11 +322,7 @@ function print_time() {
[[ $m != "0" ]] && output+=" $m $m_string" [[ $m != "0" ]] && output+=" $m $m_string"
[[ $s != "0" ]] && output+=" $s $s_string" [[ $s != "0" ]] && output+=" $s $s_string"
if [[ "$output" == "" ]]; then echo $output
echo "0 seconds"
else
echo $output
fi
} }
function start_service() { function start_service() {