Add files via upload

NonSteamLaunchers.sh

@@ -1342,7 +1342,7 @@ eaapp_url=https://origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-rel
 eaapp_file=${logged_in_home}/Downloads/NonSteamLaunchersInstallation/EAappInstaller.exe
 
 # Set the URL to download the eighth file from
-itchio_url=https://itch.io/app/download?platform=windows
+itchio_url="https://itch.io/app/download?platform=windows"
 
 # Set the path to save the eighth file to
 itchio_file=${logged_in_home}/Downloads/NonSteamLaunchersInstallation/itch-setup.exe
@@ -1855,10 +1855,13 @@ process_uninstall_options() {
                 handle_uninstall_ea "NonSteamLaunchers"
                 uninstall_launcher "$uninstall_options" "EA App" "$eaapp_path1" "$eaapp_path2" "${logged_in_home}/.local/share/Steam/steamapps/compatdata/NonSteamLaunchers/pfx/drive_c/users/steamuser/Downloads/EAappInstaller.exe" "${logged_in_home}/.local/share/Steam/steamapps/compatdata/TheEAappLauncher/pfx/drive_c/users/steamuser/Downloads/EAappInstaller.exe" "eaapp" "ea_app"
                 sed -i '/repaireaapp/d' "${logged_in_home}/.config/systemd/user/env_vars"
+                rm -f "${logged_in_home}/.local/share/Steam/steamapps/compatdata/NonSteamLaunchers/pfx/drive_c/users/steamuser/Downloads/EAappInstaller.exe"
+
             elif [[ -d "${logged_in_home}/.local/share/Steam/steamapps/compatdata/TheEAappLauncher/pfx/drive_c/Program Files/Electronic Arts" ]]; then
                 handle_uninstall_ea "TheEAappLauncher"
                 uninstall_launcher "$uninstall_options" "EA App" "$eaapp_path1" "$eaapp_path2" "${logged_in_home}/.local/share/Steam/steamapps/compatdata/NonSteamLaunchers/pfx/drive_c/users/steamuser/Downloads/EAappInstaller.exe" "${logged_in_home}/.local/share/Steam/steamapps/compatdata/TheEAappLauncher/pfx/drive_c/users/steamuser/Downloads/EAappInstaller.exe" "eaapp" "ea_app"
                 sed -i '/repaireaapp/d' "${logged_in_home}/.config/systemd/user/env_vars"
+                rm -f "${logged_in_home}/.local/share/Steam/steamapps/compatdata/TheEAappLauncher/pfx/drive_c/users/steamuser/Downloads/EAappInstaller.exe"
             fi
         fi
         if [[ $uninstall_options == *"Uninstall Legacy Games"* ]]; then
@@ -2995,6 +2998,26 @@ function install_launcher {
             mkdir -p "${logged_in_home}/.local/share/Steam/steamapps/compatdata/$appid"
         fi
 
+        #temp ubi fix
+        if [[ "$launcher_name" == "Ubisoft Connect" ]]; then
+            for root in \
+                "$HOME/.local/share/Steam" \
+                "$HOME/.steam/steam" \
+                /run/media/"$USER"/* \
+                /mnt/* \
+                /media/*
+            do
+                # skip if glob didn't expand to real dirs
+                [[ -d "$root" ]] || continue
+
+                if [[ -x "$root/steamapps/common/Proton - Experimental/proton" ]]; then
+                    proton_dir="$root/steamapps/common/Proton - Experimental"
+                    break
+                fi
+            done
+        fi
+
+
         # Change working directory to Proton's
         cd $proton_dir
 
@@ -3007,7 +3030,7 @@ function install_launcher {
         # Download file
         if [ ! -f "$file_name" ]; then
             echo "Downloading ${file_name}"
-            curl -L $file_url -o $file_name
+            curl -L "$file_url" -o "$file_name"
         fi
 
         # Execute the pre-installation command, if provided
@@ -3151,6 +3174,31 @@ install_launcher "Big Fish Games Manager" "BigFishLauncher" "$bigfish_file" "$bi
 install_launcher "Gryphlink" "GryphlinkLauncher" "$gryphlink_file" "$gryphlink_url" "" "98" "" "install_gryphlink" true
 
 
+#temp ea fix
+if [[ "$options" == *"EA App"* ]]; then
+
+  if [ -d "${logged_in_home}/.local/share/Steam/steamapps/compatdata/NonSteamLaunchers/pfx/drive_c/Program Files/Electronic Arts/EA Desktop" ]; then
+    BASE="${logged_in_home}/.local/share/Steam/steamapps/compatdata/NonSteamLaunchers/pfx/drive_c/Program Files/Electronic Arts/EA Desktop"
+
+  elif [ -d "${logged_in_home}/.local/share/Steam/steamapps/compatdata/TheEAappLauncher/pfx/drive_c/Program Files/Electronic Arts/EA Desktop" ]; then
+    BASE="${logged_in_home}/.local/share/Steam/steamapps/compatdata/TheEAappLauncher/pfx/drive_c/Program Files/Electronic Arts/EA Desktop"
+  else
+    echo "EA Desktop folder not found."
+    return
+  fi
+
+  cd "$BASE" || return
+
+  VER=$(ls -d */ 2>/dev/null | grep -v "EA Desktop" | head -n 1 | sed 's#/##')
+
+  if [ -n "$VER" ] && [ -d "$VER/EA Desktop" ]; then
+    mv "$VER/EA Desktop" .
+    rmdir "$VER"
+  fi
+
+fi
+
+
 #End of Launcher Installations