Hotfix/Polish Cloud Services

* Added missing remote play clients to all.sh
    * This allows these clients to properly install
* Fixed install locations for Greenlight and ShadowPC
* Fixed error in cloud.conf
    * Restores https://github.com/dragoonDorise/EmuDeck/pull/941
    * This was not working originally because the cloud.conf file is never updated once it's copied to Emulation/roms/cloud
        * Added a grep command to detect "browercommand" so this cloud.conf can be updated once in order for this PR to work properly
* Added ES-DE and Pegasus optional support
    * Added a prompt so users can select if they would like their services in ES-DE and Pegasus. Copies files to Emulation/roms/desktop
    * Removed cloud and remoteplay from Pegasus so scraping can be shared properly between ES-DE and Pegasus
    * Swapped default desktop system for ES-DE to "Keep ES-DE running"
* Added back firefox support
    * Reverts https://github.com/dragoonDorise/EmuDeck/pull/910
* Added Steam ROM Manager parser for bash and desktop files with proper exclusion for the cloud and remoteplay folders

Co-authored-by: rawdatafeel <108900299+rawdatafeel@users.noreply.github.com>
Co-authored-by: Thomas Crider <11287837+GloriousEggroll@users.noreply.github.com>

configs/pegasus-frontend/game_dirs.txt

@@ -32,7 +32,6 @@
 /run/media/mmcblk0p1/Emulation/roms/cdtv
 /run/media/mmcblk0p1/Emulation/roms/chailove
 /run/media/mmcblk0p1/Emulation/roms/channelf
-/run/media/mmcblk0p1/Emulation/roms/cloud
 /run/media/mmcblk0p1/Emulation/roms/coco
 /run/media/mmcblk0p1/Emulation/roms/coleco
 /run/media/mmcblk0p1/Emulation/roms/colecovision
@@ -43,6 +42,8 @@
 /run/media/mmcblk0p1/Emulation/roms/crvision
 /run/media/mmcblk0p1/Emulation/roms/daphne
 /run/media/mmcblk0p1/Emulation/roms/desktop
+/run/media/mmcblk0p1/Emulation/roms/desktop/cloud
+/run/media/mmcblk0p1/Emulation/roms/desktop/remoteplay
 /run/media/mmcblk0p1/Emulation/roms/doom
 /run/media/mmcblk0p1/Emulation/roms/dos
 /run/media/mmcblk0p1/Emulation/roms/dragon32
@@ -128,7 +129,6 @@
 /run/media/mmcblk0p1/Emulation/roms/pv1000
 /run/media/mmcblk0p1/Emulation/roms/quake
 /run/media/mmcblk0p1/Emulation/roms/quake_1
-/run/media/mmcblk0p1/Emulation/roms/remoteplay
 /run/media/mmcblk0p1/Emulation/roms/roms
 /run/media/mmcblk0p1/Emulation/roms/samcoupe
 /run/media/mmcblk0p1/Emulation/roms/satellaview

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

@@ -2425,6 +2425,94 @@
       "steamInputEnabled": "1",
       "drmProtect": false
   },
+  {
+    "parserType": "Glob",
+    "configTitle": "Desktop Applications",
+    "steamDirectory": "${steamdirglobal}",
+    "steamCategory": "${Desktop Applications}",
+    "romDirectory": "${romsdirglobal}",
+    "executableArgs": "",
+    "executableModifier": "\"${exePath}\"",
+    "startInDirectory": "",
+    "titleModifier": "${fuzzyTitle}",
+    "fetchControllerTemplatesButton": null,
+    "removeControllersButton": null,
+    "steamInputEnabled": "1",
+    "imageProviders": [
+        "sgdb"
+    ],
+    "onlineImageQueries": "${${fuzzyTitle}}",
+    "imagePool": "${fuzzyTitle}",
+    "drmProtect": false,
+    "userAccounts": {
+        "specifiedAccounts": ""
+    },
+    "executable": {
+        "path": "",
+        "shortcutPassthrough": true,
+        "appendArgsToExecutable": true
+    },
+    "parserInputs": {
+        "glob": "{desktop/**/!(cloud|remoteplay),desktop}/${title}@(sh|.SH|.desktop|.DESKTOP)"
+    },
+    "titleFromVariable": {
+        "limitToGroups": "",
+        "caseInsensitiveVariables": false,
+        "skipFileIfVariableWasNotFound": false,
+        "tryToMatchTitle": false
+    },
+    "fuzzyMatch": {
+        "replaceDiacritics": true,
+        "removeCharacters": true,
+        "removeBrackets": true
+    },
+    "controllers": {
+        "ps4": null,
+        "ps5": null,
+        "ps5_edge": null,
+        "xbox360": null,
+        "xboxone": null,
+        "xboxelite": null,
+        "switch_joycon_left": null,
+        "switch_joycon_right": null,
+        "switch_pro": null,
+        "neptune": null,
+        "steamcontroller_gordon": null
+    },
+    "imageProviderAPIs": {
+        "sgdb": {
+            "nsfw": false,
+            "humor": false,
+            "styles": [],
+            "stylesHero": [],
+            "stylesLogo": [],
+            "stylesIcon": [],
+            "imageMotionTypes": [
+                "static"
+            ],
+            "sizes": [],
+            "sizesHero": [],
+            "sizesIcon": []
+        },
+        "steamCDN": {}
+    },
+    "defaultImage": {
+        "tall": "",
+        "long": "",
+        "hero": "",
+        "logo": "",
+        "icon": ""
+    },
+    "localImages": {
+        "tall": "",
+        "long": "",
+        "hero": "",
+        "logo": "",
+        "icon": ""
+    },
+    "parserId": "171773288577350796",
+    "version": 18
+  },
   {
       "parserType": "Glob",
       "configTitle": "DooM - RetroArch PrBoom",

functions/RemotePlayClientScripts/remotePlayChiaki.sh

@@ -23,7 +23,7 @@ Chiaki_install() {
 Chiaki_init() {
 	setMSG "Initializing $Chiaki_emuName settings."	
 	configEmuFP "$Chiaki_emuName" "$Chiaki_emuPath" "true"
-	$Chiaki_addSteamInputProfile
+	#Chiaki_addSteamInputProfile
 }
 
 # Update flatpak & launcher script
@@ -64,5 +64,6 @@ Chiaki_IsInstalled() {
 
 # Import steam profile
 Chiaki_addSteamInputProfile() {
-	rsync -r "$EMUDECKGIT/configs/steam-input/emudeck_chiaki_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/"
+	echo "NYI"
+	#rsync -r "$EMUDECKGIT/configs/steam-input/emudeck_chiaki_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/"
 }

functions/RemotePlayClientScripts/remotePlayGreenlight.sh

@@ -3,18 +3,15 @@
 # Variables
 Greenlight_emuName="Greenlight"
 Greenlight_emuType="$emuDeckEmuTypeAppImage"
-Greenlight_emuPath="$romsPath/remoteplay/Greenlight.AppImage"
+Greenlight_emuPath="$HOME/Applications/Greenlight.AppImage"
+
 
 # Install
 Greenlight_install() {
     echo "Begin Greenlight Install"
 
 	local showProgress="$1"
-	if installEmuAI "Greenlight" "$(getReleaseURLGH "unknownskl/greenlight" ".AppImage")" "" "$showProgress"; then
-		return 1
-	else
-		return 0
-	fi
+	installEmuAI "Greenlight" "$(getReleaseURLGH "unknownskl/greenlight" ".AppImage")" "" "$showProgress"
 
 	cp "$EMUDECKGIT/tools/remoteplayclients/Greenlight.sh" "$romsPath/remoteplay"
 	chmod +x "$romsPath/remoteplay/Greenlight.sh"
@@ -32,7 +29,7 @@ Greenlight_init() {
 # Update appimage by reinstalling
 Greenlight_update() {
 	setMSG "Updating $Greenlight_emuName."
-	rm -rf "$Greenlight_emuPath"
+	rm -f "$Greenlight_emuPath"
 	Greenlight_install
 	# configEmuAI "$Greenlight_emuName" "config" "$HOME/.config/greenlilght" "$EMUDECKGIT/configs/Greenlight/.config/greenlight"
 	# Greenlight_addSteamInputProfile
@@ -41,16 +38,18 @@ Greenlight_update() {
 # Uninstall
 Greenlight_uninstall() {
 	setMSG "Uninstalling $Greenlight_emuName."
-	rm -rf "$Greenlight_emuPath"
-	rm "$romsPath/remoteplay/Greenlight Remote Play Client.sh"
+	rm -f "$Greenlight_emuPath"
+	rm "$romsPath/remoteplay/Greenlight.sh"
 }
 
 # Check if installed
 Greenlight_IsInstalled() {
-	if [ -e "$Greenlight_emuPath" ]; then
-		echo "true"
+	if [ -f "$Greenlight_emuPath" ]; then
+		echo true
+		return 1
 	else
-		echo "false"
+		echo false
+		return 0
 	fi
 }
 

functions/RemotePlayClientScripts/remotePlayMoonlight.sh

@@ -23,7 +23,7 @@ Moonlight_install() {
 Moonlight_init() {
 	setMSG "Initializing $Moonlight_emuName settings."	
 	configEmuFP "$Moonlight_emuName" "$Moonlight_emuPath" "true"
-	$Moonlight_addSteamInputProfile
+	#Moonlight_addSteamInputProfile
 }
 
 # Update flatpak & launcher script
@@ -64,5 +64,6 @@ Moonlight_IsInstalled() {
 
 # Import steam profile
 Moonlight_addSteamInputProfile() {
-	rsync -r "$EMUDECKGIT/configs/steam-input/emudeck_moonlight_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/"
+	echo "NYI"
+	#rsync -r "$EMUDECKGIT/configs/steam-input/emudeck_moonlight_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/"
 }

functions/RemotePlayClientScripts/remotePlayParsec.sh

@@ -23,7 +23,7 @@ Parsec_install() {
 Parsec_init() {
 	setMSG "Initializing $Parsec_emuName settings."	
 	configEmuFP "$Parsec_emuName" "$Parsec_emuPath" "true"
-	$Parsec_addSteamInputProfile
+	#Parsec_addSteamInputProfile
 }
 
 # Update flatpak & launcher script
@@ -64,5 +64,6 @@ Parsec_IsInstalled() {
 
 # Import steam profile
 Parsec_addSteamInputProfile() {
-	rsync -r "$EMUDECKGIT/configs/steam-input/emudeck_parsec_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/"
+	echo "NYI"
+	#rsync -r "$EMUDECKGIT/configs/steam-input/emudeck_parsec_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/"
 }

functions/RemotePlayClientScripts/remotePlayShadow.sh

@@ -3,7 +3,7 @@
 # Variables
 ShadowPC_emuName="ShadowPC"
 ShadowPC_emuType="AppImage"
-ShadowPC_emuPath="$romsPath/remoteplay/ShadowPC.AppImage"
+ShadowPC_emuPath="$HOME/Applications/ShadowPC.AppImage"
 ShadowPC_releaseURL="https://update.Shadow.tech/launcher/prod/linux/ubuntu_18.04/ShadowPC.AppImage"
 
 # Install
@@ -11,12 +11,9 @@ ShadowPC_install() {
 	setMSG "Installing $ShadowPC_emuName."
 
     local showProgress=$1
-	local installShadowPC=$(wget -q $ShadowPC_releaseURL -P $ShadowPC_emuPath)
-    if installShadowPC; then
-		return 1
-	else
-        return 0
-    fi
+	#local installShadowPC=$(wget -q $ShadowPC_releaseURL -P $ShadowPC_emuPath)
+	installEmuAI "ShadowPC" $ShadowPC_releaseURL "" "" "$showProgress"
+
 
 	cp "$EMUDECKGIT/tools/remoteplayclients/ShadowPC.sh" "$romsPath/remoteplay"
 	chmod +x "$romsPath/remoteplay/ShadowPC.sh"
@@ -24,26 +21,28 @@ ShadowPC_install() {
 
 # ApplyInitialSettings
 ShadowPC_init() {
-	setMSG "Initializing $ShadowPC_emuName settings."	
-	$ShadowPC_addSteamInputProfile
+	echo "NYI"
+	#setMSG "Initializing $ShadowPC_emuName settings."	
+	#$ShadowPC_addSteamInputProfile
 }
 
 # Update appimage
 ShadowPC_update() {
 	setMSG "Updating $ShadowPC_emuName settings."
-	rm "$ShadowPC_emuPath"
-	$ShadowPC_install
+	rm -f "$ShadowPC_emuPath"
+	ShadowPC_install
 }
 
 # Uninstall
 ShadowPC_uninstall() {
 	setMSG "Uninstalling $ShadowPC_emuName."
-	rm "$ShadowPC_emuPath"
+	rm -f "$ShadowPC_emuPath"
+	rm -f "$romsPath/remoteplay/ShadowPC.sh"
 }
 
 # Check if installed
 ShadowPC_IsInstalled() {
-	if [ -e "$ShadowPC_emuPath" ]; then
+	if [ -f "$ShadowPC_emuPath" ]; then
 		echo true
 		return 1
 	else

functions/RemotePlayClientScripts/remotePlaySpotify.sh

@@ -16,14 +16,14 @@ Spotify_install() {
 	flatpak override "$ID" --share=network --user
 	cp "$EMUDECKGIT/tools/remoteplayclients/Spotify.sh" "$romsPath/remoteplay"
 	chmod +x "$romsPath/remoteplay/Spotify.sh"
-	Spotify_addSteamInputProfile
+	#Spotify_addSteamInputProfile
 }
 
 # ApplyInitialSettings
 Spotify_init() {
 	setMSG "Initializing $Spotify_emuName settings."	
 	configEmuFP "$Spotify_emuName" "$Spotify_emuPath" "true"
-	$Spotify_addSteamInputProfile
+	#Spotify_addSteamInputProfile
 }
 
 # Update flatpak & launcher script
@@ -58,5 +58,6 @@ Spotify_IsInstalled() {
 
 # Import steam profile
 Spotify_addSteamInputProfile() {
-	rsync -r "$EMUDECKGIT/configs/steam-input/emudeck_spotify_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/"
+	echo "NYI"
+	#rsync -r "$EMUDECKGIT/configs/steam-input/emudeck_spotify_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/"
 }

functions/RemotePlayClientScripts/remotePlaySteamLink.sh

@@ -16,14 +16,14 @@ SteamLink_install() {
 	flatpak override "$ID" --share=network --user
 	cp "$EMUDECKGIT/tools/remoteplayclients/SteamLink.sh" "$romsPath/remoteplay"
 	chmod +x "$romsPath/remoteplay/SteamLink.sh"
-	SteamLink_addSteamInputProfile
+	#SteamLink_addSteamInputProfile
 }
 
 # ApplyInitialSettings
 SteamLink_init() {
 	setMSG "Initializing $SteamLink_emuName settings."	
 	configEmuFP "$SteamLink_emuName" "$SteamLink_emuPath" "true"
-	$SteamLink_addSteamInputProfile
+	#SteamLink_addSteamInputProfile
 }
 
 # Update flatpak & launcher script
@@ -58,5 +58,6 @@ SteamLink_IsInstalled() {
 
 # Import steam profile
 SteamLink_addSteamInputProfile() {
-	rsync -r "$EMUDECKGIT/configs/steam-input/emudeck_steamlink_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/"
+	echo "NYI"
+	#rsync -r "$EMUDECKGIT/configs/steam-input/emudeck_steamlink_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/"
 }

functions/ToolScripts/emuDeckPegasus.sh

@@ -60,6 +60,10 @@ pegasus_init(){
 				rm -rf "$systemPath/roms/media" &> /dev/null
 				rm -rf "$romsPath/xbox360/roms/xbla/media" &> /dev/null
 				rm -rf "$romsPath/xbox360/roms/xbla/metadata.txt" &> /dev/null
+			elif  [[ "$systemPath" == "$romsPath/desktop" ]]; then
+				rm -rf "$romsPath/desktop/remoteplay/media" &> /dev/null
+				rm -rf "$romsPath/desktop/cloud/media" &> /dev/null
+				rm -rf "$systemPath/media" &> /dev/null		
 			elif  [[ "$systemPath" == "$romsPath/gamecube" || "$systemPath" == "$romsPath/3ds" ]]; then
 				continue
 			else
@@ -78,6 +82,15 @@ pegasus_init(){
 				rm -rf "$toolsPath/downloaded_media/$system/wheel" &> /dev/null
 				rm -rf "$toolsPath/downloaded_media/$system/screenshot" &> /dev/null
 				mkdir -p "$toolsPath/downloaded_media/$system/screenshots/"
+			elif [[ "$systemPath" == "$romsPath/desktop" ]]; then
+				system=$(echo "$systemPath" | sed 's/.*\/\([^\/]*\)\/\?$/\1/')
+				echo $system
+				mkdir -p "$toolsPath/downloaded_media/$system/covers"
+				rm -rf "$toolsPath/downloaded_media/$system/box2dfront"
+				mkdir -p "$toolsPath/downloaded_media/$system/marquees"
+				rm -rf "$toolsPath/downloaded_media/$system/wheel" &> /dev/null
+				rm -rf "$toolsPath/downloaded_media/$system/screenshot" &> /dev/null
+				mkdir -p "$toolsPath/downloaded_media/$system/screenshots/"
 			elif  [[ "$systemPath" == "$romsPath/gamecube" || "$systemPath" == "$romsPath/3ds" ]]; then
 				continue
 			else
@@ -99,6 +112,18 @@ pegasus_init(){
 				ln -s "$toolsPath/downloaded_media/$system/covers/" "$toolsPath/downloaded_media/$system/box2dfront" &> /dev/null
 				ln -s "$toolsPath/downloaded_media/$system/marquees/" "$toolsPath/downloaded_media/$system/wheel" &> /dev/null
 				ln -s "$toolsPath/downloaded_media/$system/screenshots/" "$toolsPath/downloaded_media/$system/screenshot" &> /dev/null
+			elif [[ "$systemPath" == "$romsPath/desktop" ]]; then
+				system=$(echo "$systemPath" | sed 's/.*\/\([^\/]*\)\/\?$/\1/')
+				ln -s "$toolsPath/downloaded_media/$system" "$systemPath/media" &> /dev/null
+				if [ -d  "$romsPath/desktop/cloud" ]; then 
+					ln -s "$toolsPath/downloaded_media/$system" "$systemPath/cloud/media" &> /dev/null
+				fi 
+				if [ -d "$romsPath/desktop/remoteplay" ]; then 
+					ln -s "$toolsPath/downloaded_media/$system" "$systemPath/remoteplay/media" &> /dev/null
+				fi 
+				ln -s "$toolsPath/downloaded_media/$system/covers/" "$toolsPath/downloaded_media/$system/box2dfront" &> /dev/null
+				ln -s "$toolsPath/downloaded_media/$system/marquees/" "$toolsPath/downloaded_media/$system/wheel" &> /dev/null
+				ln -s "$toolsPath/downloaded_media/$system/screenshots/" "$toolsPath/downloaded_media/$system/screenshot" &> /dev/null
 			elif  [[ "$systemPath" == "$romsPath/gamecube" || "$systemPath" == "$romsPath/3ds" ]]; then
 				continue
 			else

functions/all.sh

@@ -94,9 +94,13 @@ source "$EMUDECKGIT"/functions/EmuScripts/emuDeckModel2.sh
 
 #remoteplayclientscripts
 source "$EMUDECKGIT"/functions/RemotePlayClientScripts/remotePlayChiaki.sh
-source "$EMUDECKGIT"/functions/RemotePlayClientScripts/remotePlayParsec.sh
-source "$EMUDECKGIT"/functions/RemotePlayClientScripts/remotePlayMoonlight.sh
 source "$EMUDECKGIT"/functions/RemotePlayClientScripts/remotePlayGreenlight.sh
+source "$EMUDECKGIT"/functions/RemotePlayClientScripts/remotePlayMoonlight.sh
+source "$EMUDECKGIT"/functions/RemotePlayClientScripts/remotePlayParsec.sh
+source "$EMUDECKGIT"/functions/RemotePlayClientScripts/remotePlayShadow.sh
+source "$EMUDECKGIT"/functions/RemotePlayClientScripts/remotePlaySpotify.sh
+source "$EMUDECKGIT"/functions/RemotePlayClientScripts/remotePlaySteamLink.sh
+
 source "$EMUDECKGIT"/functions/cloudSyncHealth.sh
 
 #Soon

functions/cloudServicesManager.sh

@@ -122,6 +122,7 @@ manageRPSMenu() {
 	# Create array of all Remote Play clients
 	cd "$EMUDECKGIT/functions/RemotePlayClientScripts"
 	declare -a arrAllRP=()
+	
 	Chiaki_IsInstalled
 	ans=$?
 	if [ "$ans" == "1" ]; then
@@ -236,7 +237,7 @@ manageRPSMenu() {
 					Spotify_update
 				else
 					Spotify_install
-				fi
+				fi 			
 			elif [ "$i" == "SteamLink" ]; then
 				SteamLink_IsInstalled
 				ans=$?
@@ -296,7 +297,7 @@ manageRPSMenu() {
 }
 
 changeSettingsMenu() {
-	declare -a arrSupBrows=("com.google.Chrome" "com.microsoft.Edge" "com.brave.Browser" "org.chromium.Chromium")
+	declare -a arrSupBrows=("com.google.Chrome" "com.microsoft.Edge"  "org.mozilla.firefox" "com.brave.Browser" "org.chromium.Chromium")
 	declare -a arrBrowsOpts=()
 
 	# Include system default browser and verify it is is installed
@@ -398,10 +399,13 @@ csmMainMenu() {
 	menuText=$(printf "<b>Main Menu</b>\n\n Currently Set Browser: $BROWSERAPP\n")
 	CHOICE=$(zenity --list \
 		--title="Cloud Services Manager" --text="$menuText" \
-        --width=300  --height=300 \
+        --width=400  --height=400 \
+		--ok-label="Select" \
+		--cancel-label="Exit" \
 		--column="" --column="Select an option:" --radiolist \
 			"" "Manage Cloud Services" \
 			"" "Manage Remote Play Clients" \
+			"" "Add to ES-DE and Pegasus" \
 			"" "Change Settings" \
 			"" "Quit")
     if [ $? != 0 ]; then
@@ -414,6 +418,8 @@ csmMainMenu() {
 		manageRPSMenu
 	elif [ "$CHOICE" == "Change Settings" ]; then
 		changeSettingsMenu
+	elif [ "$CHOICE" == "Add to ES-DE and Pegasus" ]; then
+		addESDEPegasus
 	elif [ "$CHOICE" == "Quit" ]; then
 		exit
 	fi
@@ -465,6 +471,68 @@ fixCloudScripts() {
 	fi
 }
 
+addESDEPegasus(){
+
+
+	# Ask to install new services or change settings
+	esdepegasusmenuText=$(printf "<b>ES-DE and Pegasus</b>\n\n Would you like to add your selected cloud services and remote play clients to ES-DE and Pegasus?\n\n This will copy your cloud services and remote play clients to the Emulation/roms/desktop folder.\n\n When using ES-DE, your cloud services and remote play clients will show up under the Desktop system.\n\n When using Pegasus, your cloud services and remote play clients will show up under the Cloud Services and Remote Play Clients system respectively.\n\n This will have no impact on Steam ROM Manager or any shortcuts you may have added to Steam using Steam ROM Manager.\n\n ")
+	ESDEPEGASUSCHOICE=$(zenity --list \
+		--title="Cloud Services Manager" --text="$esdepegasusmenuText" \
+        --width=350  --height=450 \
+		--ok-label="Select" \
+		--cancel-label="Return to Main Menu" \
+		--column="" --column="Select an option:" --radiolist \
+			"" "Add to ES-DE and Pegasus" \
+			"" "Remove from ES-DE and Pegasus" )
+
+    if [ $? != 0 ]; then
+        csmMainMenu
+    fi
+
+	if [ "$ESDEPEGASUSCHOICE" == "Add to ES-DE and Pegasus" ]; then
+		mkdir -p "$romsPath/desktop/cloud"
+		mkdir -p "$romsPath/desktop/remoteplay"
+		rsync -av --include='*.sh' --exclude='*' "$romsPath/cloud/" "$romsPath/desktop/cloud"
+		rsync -av --include='*.sh' --exclude='*' "$romsPath/remoteplay/" "$romsPath/desktop/remoteplay"
+
+		
+		# Pegasus
+		local pegasusDirectoriesFile="$HOME/.config/pegasus-frontend/game_dirs.txt"
+		cp "$HOME/.config/EmuDeck/backend/roms/desktop/cloud/metadata.txt" "$romsPath/desktop/cloud"
+		cp "$HOME/.config/EmuDeck/backend/roms/desktop/remoteplay/metadata.txt" "$romsPath/desktop/remoteplay"
+		cp "$HOME/.config/EmuDeck/backend/roms/desktop/cloud/metadata.txt" "$romsPath/desktop/cloud"
+		
+		if ! grep -Fxq "$romsPath/desktop/cloud" "$pegasusDirectoriesFile"; then
+			echo "$romsPath/desktop/cloud" >> "$pegasusDirectoriesFile"
+		fi
+
+		if ! grep -Fxq "$romsPath/desktop/remoteplay" "$pegasusDirectoriesFile"; then
+			echo "$romsPath/desktop/remoteplay" >> "$pegasusDirectoriesFile"
+		fi
+
+		if [ -f "$romsPath/remoteplay/metadata.txt" ]; then 
+			rm -f "$romsPath/remoteplay/metadata.txt"
+		fi 
+
+		if [ -f "$romsPath/cloud/metadata.txt" ]; then 
+			rm -f "$romsPath/cloud/metadata.txt"
+		fi 
+
+		# Pegasus end
+		
+		zenity --info --text="Cloud services and remote play clients added to ES-DE and Pegasus." \
+		--width=250 
+		csmMainMenu
+	elif [ "$ESDEPEGASUSCHOICE" == "Remove from ES-DE and Pegasus" ]; then
+		find "$romsPath/desktop/cloud" -name "*.sh" -type f -delete
+		find "$romsPath/desktop/remoteplay" -name "*.sh" -type f -delete
+		zenity --info --text="Cloud services and remote play clients removed from ES-DE and Pegasus." \
+		--width=250 
+		csmMainMenu
+	fi
+
+}
+
 ##################
 # Initialization #
 ##################
@@ -480,6 +548,7 @@ source "$EMUDECKGIT/functions/all.sh"
 # Check for existing cloud.conf or install & setup
 mkdir -p "$romsPath/cloud"
 mkdir -p "$romsPath/remoteplay"
+
 if [ ! -f "$romsPath/cloud/cloud.conf" ]; then
 	cp "$LOCALCLOUDFILES/cloud.conf" "$romsPath/cloud"
 	CLOUDSETTINGSFILE="$romsPath/cloud/cloud.conf"
@@ -496,6 +565,23 @@ if [ ! -f "$romsPath/cloud/cloud.conf" ]; then
 	flatpak --user override --filesystem=/run/udev:ro "$defaultBrowser"
 fi
 
+# Update cloud.conf with latest config.
+if ! grep -q "browsercommand()" "$romsPath/cloud/cloud.conf"; then
+	cp "$LOCALCLOUDFILES/cloud.conf" "$romsPath/cloud"
+	CLOUDSETTINGSFILE="$romsPath/cloud/cloud.conf"
+	source "$CLOUDSETTINGSFILE"
+
+	# Set web browser to system default browser
+	defaultBrowser=$(
+        APP=$(xdg-settings get default-web-browser)
+        EXT=".desktop"
+		# Exclude extension
+        echo "${APP%"$EXT"}"
+    )
+	setCloudSetting BROWSERAPP "$defaultBrowser"
+	flatpak --user override --filesystem=/run/udev:ro "$defaultBrowser"
+fi 
+
 CLOUDSETTINGSFILE="$romsPath/cloud/cloud.conf"
 source "$CLOUDSETTINGSFILE"
 

roms/desktop/cloud/metadata.txt

@@ -1,4 +1,4 @@
 collection: Cloud Services
 shortname: cloud
 extensions: sh
-launch:  {file.path}
+launch:  {file.path}

roms/desktop/metadata.txt

@@ -1,7 +1,7 @@
 collection: Desktop Applications
 shortname: desktop
 extensions: desktop, sh
-launch: PLACEHOLDER {file.path}
+launch:  {file.path}
 
 
 

roms/desktop/remoteplay/metadata.txt

@@ -1,6 +1,4 @@
 collection: Remote Play Clients
 shortname: remoteplay
 extensions: sh
-launch:  {file.path}
-
-
+launch:  {file.path}

tools/cloud/Amazon Luna (2020).sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://luna.amazon.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Amazon Prime Video (2006).sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://www.amazon.com/video"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Antstream.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://live.antstream.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Apple TV.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://tv.apple.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Crave.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://www.crave.ca/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Crunchyroll.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://www.crunchyroll.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Discord.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://discord.com/app"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Disney+.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://www.disneyplus.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Dropout.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK=https://www.dropout.tv/browse
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Emby Theater (Program).sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://emby.media/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/HBO Max.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://www.max.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Home Assistant (Program).sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://demo.home-assistant.io/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Hulu.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://www.hulu.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Jellyfin.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="http://localhost:8096"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Kavita.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
+
+LINK="http://localhost:5000"
+
+browsercommand

tools/cloud/Nebula.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://nebula.tv/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Netflix.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://www.netflix.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Paramount+.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://www.paramountplus.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Peacock TV (2020).sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://www.peacocktv.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Plex.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://app.plex.tv/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Pocket Casts.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://play.pocketcasts.com"
 
 # shellcheck source=./cloud.conf
 source ./cloud.conf
 
-"/usr/bin/flatpak" run "${FLATPAKOPTIONS}" "${BROWSERAPP}" @@u @@ "${BROWSEROPTIONS}" ${LINK}
+browsercommand

tools/cloud/Spotify.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://open.spotify.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/TikTok.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://www.tiktok.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Twitch.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://www.twitch.tv/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Twitter.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://twitter.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Vimeo (2004).sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://vimeo.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/Xbox Cloud Gaming (xCloud) (2019).sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://www.xbox.com/play"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/YouTube Music (2015).sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://music.youtube.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/YouTube TV.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://tv.youtube.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/YouTube.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://www.youtube.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/cloud/audiobookshelf.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
+
+LINK="http://localhost:13378"
+
+browsercommand

tools/cloud/cloud.conf

@@ -36,7 +36,7 @@ ${MODE} \
 # prevent possible LD_PRELOAD entries from steam being passed to browser
 LD_PRELOAD=""
 
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}() {
+browsercommand() {
   { # try flatpak with specified browserapp
     "/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
   } || { # if that fails, try running the browserapp natively

tools/cloud/webRcade.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
+source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+source "$romsPath/cloud/cloud.conf"
 
 LINK="https://play.webrcade.com/"
 
-source ./cloud.conf
-"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
+browsercommand

tools/remoteplayclients/Greenlight.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 source $HOME/.config/EmuDeck/backend/functions/all.sh
 
-"$romsPath/remoteplay/Greenlight.AppImage"
+"$HOME/Applications/Greenlight.AppImage"

tools/remoteplayclients/ShadowPC.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 source $HOME/.config/EmuDeck/backend/functions/all.sh
 
-"$romsPath/remoteplay/ShadowPC.AppImage"
+"$HOME/Applications/ShadowPC.AppImage"