sporada/lug-helper
1
0
Fork 0
mirror of https://github.com/the-sane/lug-helper.git synced 2025-07-27 04:41:51 +00:00
Code Issues Projects Releases Wiki Activity

Use tmp file instead of PID for better progress bar tracking within subshell

Browse Source
This commit is contained in:
the-sane
2025-07-23 13:11:56 -04:00
parent 141f3c1db1
commit a504e966bf
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lug-helper.sh
View File

@@ -424,22 +424,22 @@ progress_bar() {
if [ "$1" = "start" ]; then if [ "$1" = "start" ]; then
# If another progress bar is already running, do nothing # If another progress bar is already running, do nothing
if [ -n "$progressbar_pid" ]; then if [ -f "$tmp_dir/zenity_progress_bar_running" ]; then
debug_print continue "Script error: A progress_bar function instance is already running, but a new progress bar was called. This is not handled." debug_print continue "Script error: A progress_bar function instance is already running, but a new progress bar was called. This is not handled."
return 0 return 0
fi fi
# Show a zenity pulsating progress bar and get its process ID to kill when we're done # Show a zenity pulsating progress bar and use a temp file to track it inside the subshell
while true; do touch "$tmp_dir/zenity_progress_bar_running"
while [ -f "$tmp_dir/zenity_progress_bar_running" ]; do
sleep 1 sleep 1
done | zenity --progress --pulsate --no-cancel --auto-close --title="Star Citizen LUG Helper" --text="$2" 2>/dev/null & done | zenity --progress --pulsate --no-cancel --auto-close --title="Star Citizen LUG Helper" --text="$2" 2>/dev/null &
progressbar_pid="$!"
trap 'progress_bar stop' SIGINT # catch sigint to cleanly kill the zenity progress window trap 'progress_bar stop' SIGINT # catch sigint to cleanly kill the zenity progress window
elif [ "$1" = "stop" ]; then elif [ "$1" = "stop" ]; then
# Kill the zenity progress window # Stop the zenity progress window
kill "$progressbar_pid" 2>/dev/null rm --interactive=never "$tmp_dir/zenity_progress_bar_running" 2>/dev/null
trap - SIGINT # Remove the trap trap - SIGINT # Remove the trap
unset progressbar_pid # Reset the PID variable
else else
debug_print exit "Script error: The progress_bar function expects either 'start' or 'stop' as the first argument. Aborting." debug_print exit "Script error: The progress_bar function expects either 'start' or 'stop' as the first argument. Aborting."
fi fi