wbrawner/toolbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't busy-loop when waiting for the spinner to stop

Browse source
This commit is contained in:
Debarshi Ray 2019-03-08 19:59:42 +01:00
parent 2f9f71b378
commit 8ed688b724
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
toolbox
View file

@ -128,6 +128,12 @@ spinner_start()
echo -n "$message" echo -n "$message"
tput civis 2>&3 tput civis 2>&3
exec 4>"$directory/spinner-start"
if ! flock 4 2>&3; then
echo "$base_toolbox_command: unable to start spinner: spinner lock couldn't be acquired" >&2
return 1
fi
( (
while [ -f "$directory/spinner-start" ]; do while [ -f "$directory/spinner-start" ]; do
echo "$spinner_animation" | sed "s/ /\n/g" 2>&3 | while read frame; do echo "$spinner_animation" | sed "s/ /\n/g" 2>&3 | while read frame; do
@ -151,10 +157,6 @@ spinner_start()
printf "\033[2K" # delete entire line regardless of cursor position printf "\033[2K" # delete entire line regardless of cursor position
printf "\r" printf "\r"
tput cnorm 2>&3 tput cnorm 2>&3
if ! touch "$directory/spinner-stop" 2>&3; then
echo "$base_toolbox_command: unable to stop spinner: spinner stop file couldn't be created" >&2
fi
) & ) &
return 0 return 0
@ -166,14 +168,17 @@ spinner_stop()
$verbose && return $verbose && return
directory="$1" directory="$1"
exec 4>"$directory/spinner-start"
if ! rm "$directory/spinner-start" 2>&3; then if ! rm "$directory/spinner-start" 2>&3; then
echo "$base_toolbox_command: unable to stop spinner: spinner start file couldn't be removed" >&2 echo "$base_toolbox_command: unable to stop spinner: spinner start file couldn't be removed" >&2
return return
fi fi
while ! [ -f "$directory/spinner-stop" ]; do if ! flock 4 2>&3; then
: echo "$base_toolbox_command: unable to stop spinner: spinner lock couldn't be acquired" >&2
done return
fi
rm --force --recursive "$directory" 2>&3 rm --force --recursive "$directory" 2>&3
) )