Only execute spinner function if there is a tty

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
pull/4834/head
RD WebDesign 2 years ago
parent c7108a632c
commit 8d1f286f30
No known key found for this signature in database
GPG Key ID: AE3C7FC910687F33

@ -1348,30 +1348,33 @@ check_database_integrity() {
# Show a text spinner during a long process run # Show a text spinner during a long process run
# #
spinner(){ spinner(){
local PID=$! # PID of the most recent background process # Show the spinner only if there is a tty
local spin="/-\|" if tty -s; then
local start=0 local PID=$! # PID of the most recent background process
local elapsed=0 local spin="/-\|"
local i=1 local start=0
local elapsed=0
start=$(date +%s) # Start the counter local i=1
tput civis > /dev/tty # Hide the cursor start=$(date +%s) # Start the counter
trap 'tput cnorm > /dev/tty' EXIT # ensures cursor is visible again, in case of premature exit
tput civis > /dev/tty # Hide the cursor
while [ -d /proc/$PID ]; do trap 'tput cnorm > /dev/tty' EXIT # ensures cursor is visible again, in case of premature exit
elapsed=$(( $(date +%s) - start ))
# print the spinner only on screen (tty) - use hours only if needed while [ -d /proc/$PID ]; do
if [ "$elapsed" -lt 3600 ]; then elapsed=$(( $(date +%s) - start ))
printf "\r${spin:i++%${#spin}:1} %02d:%02d" $((elapsed/60)) $((elapsed%60)) >"$(tty)" # use hours only if needed
else if [ "$elapsed" -lt 3600 ]; then
printf "\r${spin:i++%${#spin}:1} %02d:%02d:%02d" $((elapsed/3600)) $(((elapsed/60)%60)) $((elapsed%60)) >"$(tty)" printf "\r${spin:i++%${#spin}:1} %02d:%02d" $((elapsed/60)) $((elapsed%60)) >"$(tty)"
fi else
sleep 0.25 printf "\r${spin:i++%${#spin}:1} %02d:%02d:%02d" $((elapsed/3600)) $(((elapsed/60)%60)) $((elapsed%60)) >"$(tty)"
done fi
sleep 0.25
done
printf "\r" >"$(tty)" # Return to the begin of the line after completion (the spinner will be overwritten) printf "\r" >"$(tty)" # Return to the begin of the line after completion (the spinner will be overwritten)
tput cnorm > /dev/tty # Restore cursor visibility tput cnorm > /dev/tty # Restore cursor visibility
fi
} }
obfuscated_pihole_log() { obfuscated_pihole_log() {

Loading…
Cancel
Save