diff --git a/lug-helper.sh b/lug-helper.sh index d5c1c4c..1493140 100755 --- a/lug-helper.sh +++ b/lug-helper.sh @@ -2701,14 +2701,11 @@ install_game_wine() { export WINEPREFIX="$install_dir" export WINEDLLOVERRIDES="winemenubuilder.exe=d" # Stop wine from creating its own .desktop entries - debug_print continue "Preparing the wine prefix. Please wait; this will take a moment..." - set -o pipefail # Pipefail is needed to catch errors in the winetricks command - if [ "$use_zenity" -eq 1 ]; then - "$winetricks_bin" -q arial tahoma dxvk powershell win11 2>&1 | tee "$tmp_install_log" | \ - zenity --progress --pulsate --no-cancel --auto-close --title="Star Citizen LUG Helper" --text="Preparing the wine prefix\n" - else - "$winetricks_bin" -q arial tahoma dxvk powershell win11 >"$tmp_install_log" 2>&1 - fi + # Let the user know they won't see any progress windows + message info "Please wait while the RSI Launcher is installed.\nThis will take a few moments and you may not see a progress window!" + + 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 if [ "$?" -eq 1 ]; then if message question "Wine prefix creation failed. Aborting installation.\nThe install log was written to\n$tmp_install_log\n\nDo you want to delete\n${install_dir}?"; then @@ -2716,7 +2713,6 @@ install_game_wine() { rm -r --interactive=never "$install_dir" fi "$wine_path"/wineserver -k - set +o pipefail # Reset pipefail return 1 fi @@ -2724,13 +2720,8 @@ install_game_wine() { "$wine_path"/wine reg add "HKEY_CURRENT_USER\Software\Wine\FileOpenAssociations" /v Enable /d N >>"$tmp_install_log" 2>&1 # Run the installer - debug_print continue "Installing the launcher. Please wait; this will take a moment..." - if [ "$use_zenity" -eq 1 ]; then - "$wine_path"/wine "$tmp_dir/$rsi_installer" /S 2>&1 | tee -a "$tmp_install_log" | \ - zenity --progress --pulsate --no-cancel --auto-close --title="Star Citizen LUG Helper" --text="Installing the launcher\n" - else - "$wine_path"/wine "$tmp_dir/$rsi_installer" /S >>"$tmp_install_log" 2>&1 - fi + debug_print continue "Installing RSI Launcher. Please wait; this will take a moment..." + "$wine_path"/wine "$tmp_dir/$rsi_installer" /S >>"$tmp_install_log" 2>&1 if [ "$?" -eq 1 ]; then # User cancelled or there was an error @@ -2739,13 +2730,9 @@ install_game_wine() { rm -r --interactive=never "$install_dir" fi "$wine_path"/wineserver -k - set +o pipefail # Reset pipefail return 0 fi - # Reset pipefail - set +o pipefail - # Kill the wine process after installation # To prevent unexpected lingering background wine processes, it should be launched by the user attached to a terminal "$wine_path"/wineserver -k