arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 14:58:08 +00:00
Code Issues Releases Wiki Activity

Only execute spinner function if there is a tty

Browse Source 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
This commit is contained in:
RD WebDesign 2022-07-24 17:52:17 -03:00
parent c7108a632c
commit 8d1f286f30
No known key found for this signature in database
GPG Key ID: AE3C7FC910687F33
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
advanced/Scripts/piholeDebug.sh
View File

@ -1348,6 +1348,8 @@ check_database_integrity() {
# Show a text spinner during a long process run # Show a text spinner during a long process run
# #
spinner(){ spinner(){
# Show the spinner only if there is a tty
if tty -s; then
local PID=$! # PID of the most recent background process local PID=$! # PID of the most recent background process
local spin="/-\|" local spin="/-\|"
local start=0 local start=0
@ -1361,7 +1363,7 @@ spinner(){
while [ -d /proc/$PID ]; do while [ -d /proc/$PID ]; do
elapsed=$(( $(date +%s) - start )) elapsed=$(( $(date +%s) - start ))
# print the spinner only on screen (tty) - use hours only if needed # use hours only if needed
if [ "$elapsed" -lt 3600 ]; then if [ "$elapsed" -lt 3600 ]; then
printf "\r${spin:i++%${#spin}:1} %02d:%02d" $((elapsed/60)) $((elapsed%60)) >"$(tty)" printf "\r${spin:i++%${#spin}:1} %02d:%02d" $((elapsed/60)) $((elapsed%60)) >"$(tty)"
else else
@ -1372,6 +1374,7 @@ spinner(){
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() {