trap and kill animation properly

This commit is contained in:
ville rantanen
2018-11-23 21:12:34 +02:00
parent ab96989293
commit 0290371e73

View File

@@ -48,12 +48,13 @@ function siprefix() {
} }
function animate() { function animate() {
CHARS="|/-__-\\" trap "trap - SIGTERM && kill -- -$$" EXIT SIGINT SIGTERM
CHARS=( "| " "/ " " _ " " \\" " |" " \\" " _ " "/ " )
i=0 i=0
while true; do while true; do
sleep 0.2 sleep 0.2
printf "\r%s\r" ${CHARS:$i:1} >&2 printf "\r %s\r" "${CHARS[$i]}" >&2
i=$(( (i + 1)%${#CHARS} )) i=$(( (i + 1)%${#CHARS[@]} ))
done done
} }
@@ -82,8 +83,8 @@ what=()
for (( i=1; i<=$#; i++ )); do for (( i=1; i<=$#; i++ )); do
[[ "${!i}" = "-f" ]] && { FORMAT=1; ((i++)); FORMAT_VALUE=${!i}; continue; } [[ "${!i}" = "-f" ]] && { FORMAT=1; ((i++)); FORMAT_VALUE=${!i}; continue; }
[[ "${!i}" = "--help" ]] && helpexit [[ "${!i}" = "--help" ]] && helpexit
[[ "${!i}" = "-"* ]] && { [[ "${!i}" = "-"* ]] && {
[[ "${!i}" =~ -.*a ]] && { ANIMATE=1; } [[ "${!i}" =~ -.*a ]] && { ANIMATE=1; }
[[ "${!i}" =~ -.*h ]] && { HUMAN=1; } [[ "${!i}" =~ -.*h ]] && { HUMAN=1; }
[[ "${!i}" =~ -.*c ]] && { COUNT=1; } [[ "${!i}" =~ -.*c ]] && { COUNT=1; }