sporada/lug-helper
1
0
Fork 0
mirror of https://github.com/the-sane/lug-helper.git synced 2024-09-21 11:32:52 +00:00
Code Issues Projects Releases Wiki Activity

Update first run experience for new install options

Browse Source
This commit is contained in:
the-sane 2024-09-08 14:51:51 -04:00
parent 12a869c136
commit 57267032b0
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lug-helper.sh
View File

@ -326,7 +326,7 @@ try_exec() {
message() { message() {
# Sanity check # Sanity check
if [ "$#" -lt 2 ]; then if [ "$#" -lt 2 ]; then
debug_print exit "Script error: The message function expects two arguments. Aborting." debug_print exit "Script error: The message function expects at least two arguments. Aborting."
fi fi
# Use zenity messages if available # Use zenity messages if available
@ -415,6 +415,24 @@ message() {
esac esac
done done
;; ;;
"options")
# Choose from two options
# call format: if message options left_button_name right_button_name "which one do you want?"; then...
printf "\n$4\n1: $3\n2: $2\n"
while read -p "[1/2]: " option; do
case "$option" in
1*)
return 0
;;
2*)
return 1
;;
*)
printf "Please type '1' or '2'\n"
;;
esac
done
;;
*) *)
debug_print exit "Script Error: Invalid message type passed to the message function. Aborting." debug_print exit "Script Error: Invalid message type passed to the message function. Aborting."
;; ;;
@ -2419,7 +2437,7 @@ install_game_lutris() {
install_version="flatpak" install_version="flatpak"
else else
# We shouldn't get here # We shouldn't get here
debug_print exit "Script error: Unable to detect Lutris version in install_game function. Aborting." debug_print exit "Script error: Unable to detect Lutris version in install_game_lutris function. Aborting."
fi fi
# Run the appropriate installer # Run the appropriate installer
@ -2429,7 +2447,7 @@ install_game_lutris() {
flatpak run --file-forwarding net.lutris.Lutris --install @@ "$lutris_install_script" @@ & flatpak run --file-forwarding net.lutris.Lutris --install @@ "$lutris_install_script" @@ &
else else
# We shouldn't get here # We shouldn't get here
debug_print exit "Script error: Unknown condition for install_version in install_game() function. Aborting." debug_print exit "Script error: Unknown condition for install_version in install_game_lutris() function. Aborting."
fi fi
message info "The installation will continue in Lutris" message info "The installation will continue in Lutris"
@ -2835,10 +2853,13 @@ if [ "$use_zenity" -eq 1 ]; then
else else
firstrun_message="$menu_heading_terminal\n\n$firstrun_message" firstrun_message="$menu_heading_terminal\n\n$firstrun_message"
fi fi
if [ "$is_firstrun" = "true" ]; then if [ "$is_firstrun" = "false" ]; then
if message question "$firstrun_message"; then if message question "$firstrun_message"; then
preflight_check if message options "Wine" "Lutris" "Which install method would you like to use?"; then
install_game install_game_lutris
else
install_game_wine
fi
fi fi
# Store the first run state for subsequent launches # Store the first run state for subsequent launches
if [ ! -d "$conf_dir/$conf_subdir" ]; then if [ ! -d "$conf_dir/$conf_subdir" ]; then