sporada/lug-helper
1
0
Fork 0
mirror of https://github.com/the-sane/lug-helper.git synced 2025-04-26 02:29:11 +00:00
Code Issues Projects Releases Wiki Activity

Traps to cleanly kill zenity progress window

Browse Source
This commit is contained in:
the-sane 2025-04-24 11:24:30 -04:00
parent 11f8c16c66
commit 389414586c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lug-helper.sh
View File

@ -2177,7 +2177,7 @@ download_file() {
stdbuf -oL tr '\r' '\n' < "$tmp_dir/lugpipe" | \ stdbuf -oL tr '\r' '\n' < "$tmp_dir/lugpipe" | \
grep --line-buffered -ve "100" | grep --line-buffered -o "[0-9]*\.[0-9]" | \ grep --line-buffered -ve "100" | grep --line-buffered -o "[0-9]*\.[0-9]" | \
( (
trap 'kill "$curlpid"' ERR trap 'kill "$curlpid"; trap - ERR' ERR
zenity --progress --auto-close --title="Star Citizen LUG Helper" --text="Downloading ${download_type}. This might take a moment.\n" 2>/dev/null zenity --progress --auto-close --title="Star Citizen LUG Helper" --text="Downloading ${download_type}. This might take a moment.\n" 2>/dev/null
) )
@ -2669,8 +2669,9 @@ install_game_wine() {
# Show a zenity pulsating progress bar and get its process ID to kill when we're done # Show a zenity pulsating progress bar and get its process ID to kill when we're done
while true; do while true; do
sleep 1 sleep 1
done | zenity --progress --pulsate --no-cancel --auto-close --title="Star Citizen LUG Helper" --text="Preparing Wine prefix and installing RSI Launcher.\nPlease wait..." 2>/dev/null & done | zenity --progress --pulsate --no-cancel --auto-close --title="Star Citizen LUG Helper" --text="Preparing Wine prefix and installing RSI Launcher. Please wait..." 2>/dev/null &
zenity_pid="$!" zenity_pid="$!"
trap 'kill "$zenity_pid"; trap - SIGINT' SIGINT
debug_print continue "Preparing Wine prefix. Please wait; this will take a moment..." debug_print continue "Preparing Wine prefix. Please wait; this will take a moment..."
"$winetricks_bin" -q arial tahoma dxvk powershell win11 >"$tmp_install_log" 2>&1 "$winetricks_bin" -q arial tahoma dxvk powershell win11 >"$tmp_install_log" 2>&1
@ -2698,12 +2699,14 @@ install_game_wine() {
rm -r --interactive=never "$install_dir" rm -r --interactive=never "$install_dir"
fi fi
kill "$zenity_pid" 2>/dev/null kill "$zenity_pid" 2>/dev/null
trap - SIGINT # Remove the trap
"$wine_path"/wineserver -k "$wine_path"/wineserver -k
return 0 return 0
fi fi
# Kill the zenity progress window # Kill the zenity progress window
kill "$zenity_pid" 2>/dev/null kill "$zenity_pid" 2>/dev/null
trap - SIGINT # Remove the trap
# Kill the wine process after installation # Kill the wine process after installation
# To prevent unexpected lingering background wine processes, it should be launched by the user attached to a terminal # To prevent unexpected lingering background wine processes, it should be launched by the user attached to a terminal