From 0290371e73eceafa773135b335a7890aa03b1513 Mon Sep 17 00:00:00 2001 From: ville rantanen Date: Fri, 23 Nov 2018 21:12:34 +0200 Subject: [PATCH] trap and kill animation properly --- files/fastdu | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/files/fastdu b/files/fastdu index bb929c5..b3e0847 100755 --- a/files/fastdu +++ b/files/fastdu @@ -48,12 +48,13 @@ function siprefix() { } function animate() { - CHARS="|/-__-\\" + trap "trap - SIGTERM && kill -- -$$" EXIT SIGINT SIGTERM + CHARS=( "| " "/ " " _ " " \\" " |" " \\" " _ " "/ " ) i=0 while true; do sleep 0.2 - printf "\r%s\r" ${CHARS:$i:1} >&2 - i=$(( (i + 1)%${#CHARS} )) + printf "\r %s\r" "${CHARS[$i]}" >&2 + i=$(( (i + 1)%${#CHARS[@]} )) done } @@ -82,8 +83,8 @@ what=() for (( i=1; i<=$#; i++ )); do [[ "${!i}" = "-f" ]] && { FORMAT=1; ((i++)); FORMAT_VALUE=${!i}; continue; } [[ "${!i}" = "--help" ]] && helpexit - - [[ "${!i}" = "-"* ]] && { + + [[ "${!i}" = "-"* ]] && { [[ "${!i}" =~ -.*a ]] && { ANIMATE=1; } [[ "${!i}" =~ -.*h ]] && { HUMAN=1; } [[ "${!i}" =~ -.*c ]] && { COUNT=1; }