fb2f25c13e
Sed is called only once now it interprets `5m37s` as `5m + 37s` -> `5*60s + 37s` -> `5*60 + 37` before, it was `5m37s` -> `5*60s37s` -> `5*60*137*1`. the problem is that the script does not insert a `+` between each non-number characters and numbers. it does now, and will understand combinations of seconds, minutes and hours. Note, the script will interpret `5m37s` and `37s5m` exactly the same way This may not be necessary if the user uses by themselves`+` to separate diffent units, though I think the current behavior is very misleading. Signed-off-by: Anjandev Momi <anjan@momi.ca>
53 lines
929 B
Bash
Executable File
53 lines
929 B
Bash
Executable File
#!/bin/sh
|
|
# SPDX-License-Identifier: AGPL-3.0-only
|
|
# Copyright 2022 Sxmo Contributors
|
|
# title="$icon_clk Timer"
|
|
# include common definitions
|
|
# shellcheck source=scripts/core/sxmo_common.sh
|
|
. sxmo_common.sh
|
|
|
|
timerrun() {
|
|
TIME=$(
|
|
echo "$@" |
|
|
sed 's/\([^0-9]\)\([0-9]\)/\1+\2/g; s/h/*60m/g; s/m/*60s/g; s/s//g' |
|
|
bc
|
|
)
|
|
|
|
DATE1=$(($(date +%s) + TIME));
|
|
while [ "$DATE1" -ge "$(date +%s)" ]; do
|
|
printf %b "$(date -u --date @$((DATE1 - $(date +%s))) +%H:%M:%S) \r";
|
|
sleep 0.1
|
|
done
|
|
echo "Done with $*"
|
|
|
|
while :;
|
|
do notify-send "Done with $*";
|
|
sxmo_vibrate 1000
|
|
sleep 0.5
|
|
done
|
|
}
|
|
|
|
menu() {
|
|
TIMEINPUT="$(
|
|
echo "
|
|
1h
|
|
10m
|
|
9m
|
|
8m
|
|
7m
|
|
6m
|
|
5m
|
|
4m
|
|
3m
|
|
2m
|
|
1m
|
|
30s
|
|
Close Menu
|
|
" | awk 'NF' | awk '{$1=$1};1' | sxmo_dmenu_with_kb.sh -p Timer
|
|
)" || exit 0
|
|
[ "Close Menu" = "$TIMEINPUT" ] && exit 0
|
|
sxmo_terminal.sh "$0" timerrun "$TIMEINPUT"
|
|
}
|
|
|
|
if [ $# -gt 0 ]; then "$@"; else menu; fi
|