Fix Citron command line arguments handling

configs/steam-rom-manager/userData/parsers/optional/nintendo_gb_mgba.json

@@ -6,7 +6,7 @@
     "steamCategories": [
         "Nintendo Game Boy - mGBA (Standalone)"
     ],
-    "executableArgs": "-f \"'${filePath}'\"",
+    "executableArgs": "-f \"${filePath}\"",
     "executableModifier": "\"${exePath}\"",
     "startInDirectory": "",
     "titleModifier": "${fuzzyTitle}",

configs/steam-rom-manager/userData/parsers/optional/nintendo_gba_mgba.json

@@ -6,7 +6,7 @@
     "steamCategories": [
         "Nintendo Game Boy Advance - mGBA (Standalone)"
     ],
-    "executableArgs": "-f \"'${filePath}'\"",
+    "executableArgs": "-f \"${filePath}\"",
     "executableModifier": "\"${exePath}\"",
     "startInDirectory": "",
     "titleModifier": "${fuzzyTitle}",

configs/steam-rom-manager/userData/parsers/optional/nintendo_gbc_mgba.json

@@ -6,7 +6,7 @@
     "steamCategories": [
         "Nintendo Game Boy Color - mGBA (Standalone)"
     ],
-    "executableArgs": "-f \"'${filePath}'\"",
+    "executableArgs": "-f \"${filePath}\"",
     "executableModifier": "\"${exePath}\"",
     "startInDirectory": "",
     "titleModifier": "${fuzzyTitle}",

configs/steam-rom-manager/userData/parsers/optional/nintendo_switch_citron.json

@@ -3,7 +3,7 @@
   "configTitle": "Nintendo Switch - Citron",
   "steamDirectory": "${steamdirglobal}",
   "romDirectory": "${romsdirglobal}/switch",
-  "executableArgs": "vblank_mode=0 %command% \"${filePath}\"",
+  "executableArgs": "vblank_mode=0 %command% -f -g \"${filePath}\"",
   "executableModifier": "\"${exePath}\"",
   "startInDirectory": "",
   "titleModifier": "${fuzzyTitle}",

configs/steam-rom-manager/userData/parsers/optional/nintendo_switch_yuzu.json

@@ -3,7 +3,7 @@
     "configTitle": "Nintendo Switch - Yuzu",
     "steamDirectory": "${steamdirglobal}",
     "romDirectory": "${romsdirglobal}/switch",
-    "executableArgs": "vblank_mode=0 %command% -f -g \"'${filePath}'\"",
+    "executableArgs": "vblank_mode=0 %command% -f -g \"${filePath}\"",
     "executableModifier": "\"${exePath}\"",
     "startInDirectory": "",
     "titleModifier": "${fuzzyTitle}",

configs/steam-rom-manager/userData/userConfigurations.json

@@ -3690,7 +3690,7 @@
         "configTitle": "Nintendo Switch - Citron",
         "steamDirectory": "${steamdirglobal}",
         "romDirectory": "${romsdirglobal}/switch",
-        "executableArgs": "vblank_mode=0 %command% \"${filePath}\"",
+        "executableArgs": "vblank_mode=0 %command% -f -g \"${filePath}\"",
         "executableModifier": "\"${exePath}\"",
         "startInDirectory": "",
         "titleModifier": "${fuzzyTitle}",
@@ -3776,7 +3776,7 @@
         "configTitle": "Nintendo Switch - Eden",
         "steamDirectory": "${steamdirglobal}",
         "romDirectory": "${romsdirglobal}/switch",
-        "executableArgs": "vblank_mode=0 %command% \"${filePath}\"",
+        "executableArgs": "vblank_mode=0 %command% -f -g \"${filePath}\"",
         "executableModifier": "\"${exePath}\"",
         "startInDirectory": "",
         "titleModifier": "${fuzzyTitle}",
@@ -3862,7 +3862,7 @@
         "configTitle": "Nintendo Switch - Ryujinx",
         "steamDirectory": "${steamdirglobal}",
         "romDirectory": "${romsdirglobal}/switch",
-        "executableArgs": "--fullscreen \"'${filePath}'\"",
+        "executableArgs": "--fullscreen \"${filePath}\"",
         "executableModifier": "\"${exePath}\"",
         "startInDirectory": "",
         "titleModifier": "${fuzzyTitle} (Ryujinx)",
@@ -6394,7 +6394,7 @@
         "configTitle": "Sony PlayStation 2 - PCSX2",
         "steamDirectory": "${steamdirglobal}",
         "romDirectory": "${romsdirglobal}/ps2",
-        "executableArgs": "-batch -fullscreen -nogui \"'${filePath}'\"",
+        "executableArgs": "-batch -fullscreen -nogui \"${filePath}\"",
         "executableModifier": "\"${exePath}\"",
         "startInDirectory": "",
         "titleModifier": "${fuzzyTitle}",
@@ -6481,7 +6481,7 @@
         "steamDirectory": "${steamdirglobal}",
         "startInDirectory": "",
         "titleModifier": "${fuzzyTitle}",
-        "executableArgs": "--no-gui \"'${filePath}'\"",
+        "executableArgs": "--no-gui \"${filePath}\"",
         "onlineImageQueries": "${${fuzzyTitle}}",
         "imagePool": "${fuzzyTitle}",
         "imageProviders": [
@@ -6562,7 +6562,7 @@
         "configTitle": "Sony PlayStation 3 - RPCS3 (Installed PKG)",
         "steamDirectory": "${steamdirglobal}",
         "romDirectory": "/run/media/mmcblk0p1/Emulation/storage/rpcs3/dev_hdd0/game",
-        "executableArgs": "--no-gui \"'${filePath}'\"",
+        "executableArgs": "--no-gui \"${filePath}\"",
         "executableModifier": "\"${exePath}\"",
         "startInDirectory": "",
         "titleModifier": "${fuzzyTitle}",

functions/EmuScripts/emuDeckEden.sh

@@ -3,7 +3,7 @@
 #variables
 Eden_emuName="eden"
 Eden_emuType="$emuDeckEmuTypeAppImage"
-Eden_emuPath="$emusFolder/eden.AppImage"
+Eden_emuPath="$emusFolder/Eden.AppImage"
 
 Eden_configFile="$HOME/.config/eden/qt-config.ini"
 

tools/launchers/citron.sh

@@ -1,28 +1,24 @@
 #!/bin/bash
-. "$HOME/.config/EmuDeck/backend/functions/all.sh"
-emulatorInit "citron"
 emuName="citron" #parameterize me
-emufolder="$emusFolder" # has to be applications for ES-DE to find it
 
-#find full path to emu executable
-exe=$(find $emufolder -iname "${emuName}*.AppImage" | sort -n | cut -d' ' -f 2- | tail -n 1 2>/dev/null)
+. "$HOME/.config/EmuDeck/backend/functions/all.sh"
+emulatorInit "$emuName"
 
-echo $exe
+# find full path to emulator appimage
+appimage=$(find "$emusFolder" -iname "${emuName}*.AppImage" -print -quit 2>/dev/null)
 
-#if appimage doesn't exist fall back to flatpak.
-if [[ $exe == '' ]]; then
-	#flatpak
-	flatpakApp=$(flatpak list --app --columns=application | grep 'citron')
-	exe="/usr/bin/flatpak run "$flatpakApp
+# if appimage doesn't exist fall back to flatpak
+if [[ -z "$appimage" ]]; then
+	flatpakApp=$(/usr/bin/flatpak list --app --columns=application | grep -im1 "${emuName}")
+	set -- /usr/bin/flatpak run "$flatpakApp" "$@"
 else
-	#make sure that file is executable
-	chmod +x $exe
+	# make sure the appimage is executable
+	chmod +x "$appimage"
+	set -- "$appimage" "$@"
 fi
 
-#run the executable with the params.
-#Fix first '
-param="${@}"
-param=$(echo $param | sed -e 's/^/"/' -e 's/$/"/')
-eval "${exe} -f -g ${param}"
+echo "Launching ${emuName} with:" "$@"
+"$@"
+
 cloud_sync_uploadForced
-rm -rf "$savesPath/.gaming";
+rm -rf "$savesPath/.gaming"

tools/launchers/eden.sh

@@ -1,28 +1,24 @@
 #!/bin/bash
-. "$HOME/.config/EmuDeck/backend/functions/all.sh"
-emulatorInit "eden"
-emuName="Eden" #parameterize me
-emufolder="$emusFolder" # has to be applications for ES-DE to find it
+emuName="eden" #parameterize me
 
-#find full path to emu executable
-exe=$(find $emufolder -iname "${emuName}*.AppImage" | sort -n | cut -d' ' -f 2- | tail -n 1 2>/dev/null)
+. "$HOME/.config/EmuDeck/backend/functions/all.sh"
+emulatorInit "$emuName"
 
-echo $exe
+# find full path to emulator appimage
+appimage=$(find "$emusFolder" -iname "${emuName}*.AppImage" -print -quit 2>/dev/null)
 
-#if appimage doesn't exist fall back to flatpak.
-if [[ $exe == '' ]]; then
-	#flatpak
-	flatpakApp=$(flatpak list --app --columns=application | grep 'Eden')
-	exe="/usr/bin/flatpak run "$flatpakApp
+# if appimage doesn't exist fall back to flatpak
+if [[ -z "$appimage" ]]; then
+	flatpakApp=$(/usr/bin/flatpak list --app --columns=application | grep -im1 "${emuName}")
+	set -- /usr/bin/flatpak run "$flatpakApp" "$@"
 else
-	#make sure that file is executable
-	chmod +x $exe
+	# make sure the appimage is executable
+	chmod +x "$appimage"
+	set -- "$appimage" "$@"
 fi
 
-#run the executable with the params.
-#Fix first '
-param="${@}"
-param=$(echo $param | sed -e 's/^/"/' -e 's/$/"/')
-eval "${exe} -f -g ${param}"
+echo "Launching ${emuName} with:" "$@"
+"$@"
+
 cloud_sync_uploadForced
-rm -rf "$savesPath/.gaming";
+rm -rf "$savesPath/.gaming"

tools/launchers/suyu.sh

@@ -1,28 +1,24 @@
 #!/bin/bash
-. "$HOME/.config/EmuDeck/backend/functions/all.sh"
-emulatorInit "suyu"
 emuName="suyu" #parameterize me
-emufolder="$emusFolder" # has to be applications for ES-DE to find it
 
-#find full path to emu executable
-exe=$(find $emufolder -iname "${emuName}*.AppImage" | sort -n | cut -d' ' -f 2- | tail -n 1 2>/dev/null)
+. "$HOME/.config/EmuDeck/backend/functions/all.sh"
+emulatorInit "$emuName"
 
-echo $exe
+# find full path to emulator appimage
+appimage=$(find "$emusFolder" -iname "${emuName}*.AppImage" -print -quit 2>/dev/null)
 
-#if appimage doesn't exist fall back to flatpak.
-if [[ $exe == '' ]]; then
-	#flatpak
-	flatpakApp=$(flatpak list --app --columns=application | grep 'citra')
-	exe="/usr/bin/flatpak run "$flatpakApp
+# if appimage doesn't exist fall back to flatpak
+if [[ -z "$appimage" ]]; then
+	flatpakApp=$(/usr/bin/flatpak list --app --columns=application | grep -im1 "${emuName}")
+	set -- /usr/bin/flatpak run "$flatpakApp" "$@"
 else
-	#make sure that file is executable
-	chmod +x $exe
+	# make sure the appimage is executable
+	chmod +x "$appimage"
+	set -- "$appimage" "$@"
 fi
 
-#run the executable with the params.
-#Fix first '
-param="${@}"
-param=$(echo $param | sed -e 's/^/"/' -e 's/$/"/')
-eval "${exe} ${param}"
+echo "Launching ${emuName} with:" "$@"
+"$@"
+
 cloud_sync_uploadForced
-rm -rf "$savesPath/.gaming";
+rm -rf "$savesPath/.gaming"