Merge branch 'early' into beta

android/functions/EmuScripts/Android_Lime3DS.sh

@@ -2,7 +2,7 @@
 
 function Android_Lime3DS_install(){
 	setMSG "Installing Citra"
-	temp_url="$(getLatestReleaseURLGH "Lime3DS/Lime3DS" ".apk")"
+	temp_url="$(getLatestReleaseURLGH "Lime3DS/lime3ds-archive" ".apk")"
 	temp_emu="citra"
 	Android_ADB_dl_installAPK $temp_emu $temp_url
 }
@@ -22,4 +22,4 @@ function Android_Lime3DS_setup(){
 function Android_Lime3DS_IsInstalled(){
 	package="org.citra.emu"
 	Android_ADB_appInstalled $package
-}
+}

functions/EmuScripts/emuDeckCitra.sh

@@ -304,11 +304,6 @@ Citra_flushSymlinks(){
 		find "$STEAMPATH/userdata" -name "shortcuts.vdf" -exec sed -i "s|${romsPath}/3ds|${romsPath}/n3ds|g" {} +
 		touch "$HOME/.config/EmuDeck/.citralegacysymlinks"
 		echo "Citra symlink cleanup completed."
-		zenity --info \
-		--text="Citra symlinks have been cleaned. This cleanup was conducted to prevent any potential breakage with symlinks. Place all new ROMs in Emulation/roms/n3ds. Your ROMs have been moved from Emulation/roms/3ds to Emulation/roms/n3ds." \
-		--title="Symlink Update" \
-		--width=400 \
-		--height=300
 
 	else
 		echo "Citra symlinks already cleaned."
@@ -366,11 +361,6 @@ Citra_flushSymlinks(){
 		find "$STEAMPATH/userdata" -name "shortcuts.vdf" -exec sed -i "s|${romsPath}/3ds|${romsPath}/n3ds|g" {} +
 		touch "$HOME/.config/EmuDeck/.citrasymlinks"
 		echo "Citra symlink cleanup completed."
-		zenity --info \
-		--text="Citra symlinks have been cleaned. This cleanup was conducted to prevent any potential breakage with symlinks. Place all new ROMs in Emulation/roms/n3ds. Your ROMs have been moved from Emulation/roms/3ds to Emulation/roms/n3ds." \
-		--title="Symlink Update" \
-		--width=400 \
-		--height=300
 
 	else
 		echo "Citra symlinks already cleaned."

functions/EmuScripts/emuDeckDolphin.sh

@@ -41,7 +41,7 @@ Dolphin_install(){
 
 #ApplyInitialSettings
 Dolphin_init(){
-  
+
   setMSG "${Dolphin_emuName}: Apply initial config"
   echo ""
 	configEmuFP "${Dolphin_emuName}" "${Dolphin_emuPath}" "true"
@@ -243,14 +243,14 @@ Dolphin_flushSymlinks(){
     rm -rf "$romsPath/gc/metadata.txt" &> /dev/null
     rm -rf "$romsPath/gc/systeminfo.txt" &> /dev/null
 
-		# The Pegasus install was accidentally overwriting the pre-existing n3ds symlink. 
-		# This checks if the gc folder is empty (post-removing the contents above) and if the original gamecube folder is still a folder and not a symlink (for those who have already migrated). 
-		# If all of this is true, the gc folder is deleted and the old symlink is temporarily recreated to proceed with the migration. 
+		# The Pegasus install was accidentally overwriting the pre-existing n3ds symlink.
+		# This checks if the gc folder is empty (post-removing the contents above) and if the original gamecube folder is still a folder and not a symlink (for those who have already migrated).
+		# If all of this is true, the gc folder is deleted and the old symlink is temporarily recreated to proceed with the migration.
     if [[ ! "$( ls -A "$romsPath/gc")" ]] && [ -d "$romsPath/gamecube" ] && [ ! -L "$romsPath/gamecube" ]; then
       rm -rf "$romsPath/gc"
-      ln -sfn "$romsPath/gamecube" "$romsPath/gc" 
-      # Temporarily restores old directory structure. 
-    fi 
+      ln -sfn "$romsPath/gamecube" "$romsPath/gc"
+      # Temporarily restores old directory structure.
+    fi
 
     if [[ -L "$romsPath/gc" && ! $(readlink -f "$romsPath/gc") =~ ^"$romsPath" ]] || [[ -L "$romsPath/gamecube" && ! $(readlink -f "$romsPath/gamecube") =~ ^"$romsPath" ]]; then
         echo "User has symlinks that don't match expected paths located under $romsPath. Aborting symlink update."
@@ -278,22 +278,16 @@ Dolphin_flushSymlinks(){
 
     rsync -avh "$EMUDECKGIT/roms/gc/." "$romsPath/gc/." --ignore-existing
 
-    if [ -d "$toolsPath/downloaded_media/gc" ] && [ ! -d "$romsPath/gc/media" ]; then 
+    if [ -d "$toolsPath/downloaded_media/gc" ] && [ ! -d "$romsPath/gc/media" ]; then
       ln -s "$toolsPath/downloaded_media/gc" "$romsPath/gc/media"
     fi
 
     find "$STEAMPATH/userdata" -name "shortcuts.vdf" -exec sed -i "s|${romsPath}/gamecube|${romsPath}/gc|g" {} +
-		touch "$HOME/.config/EmuDeck/.dolphinlegacysymlinks"	
+		touch "$HOME/.config/EmuDeck/.dolphinlegacysymlinks"
 		echo "Dolphin symlink cleanup completed."
-    zenity --info \
-    --text="Dolphin symlinks have been cleaned. This cleanup was conducted to prevent any potential breakage with symlinks. Place all new ROMs in Emulation/roms/gc. Your ROMs have been moved from Emulation/roms/gamecube to Emulation/roms/gc." \
-    --title="Symlink Update" \
-    --width=400 \
-    --height=300
-
-  else 
+  else
   		echo "Dolphin symlinks already cleaned."
-  fi 
+  fi
 
 	if [ ! -f "$HOME/.config/EmuDeck/.dolphinsymlinks" ]; then
 
@@ -303,14 +297,14 @@ Dolphin_flushSymlinks(){
     rm -rf "$romsPath/gc/metadata.txt" &> /dev/null
     rm -rf "$romsPath/gc/systeminfo.txt" &> /dev/null
 
-		# The Pegasus install was accidentally overwriting the pre-existing n3ds symlink. 
-		# This checks if the gc folder is empty (post-removing the contents above) and if the original gamecube folder is still a folder and not a symlink (for those who have already migrated). 
-		# If all of this is true, the gc folder is deleted and the old symlink is temporarily recreated to proceed with the migration. 
+		# The Pegasus install was accidentally overwriting the pre-existing n3ds symlink.
+		# This checks if the gc folder is empty (post-removing the contents above) and if the original gamecube folder is still a folder and not a symlink (for those who have already migrated).
+		# If all of this is true, the gc folder is deleted and the old symlink is temporarily recreated to proceed with the migration.
     if [[ ! "$( ls -A "$romsPath/gc")" ]] && [ -d "$romsPath/gamecube" ] && [ ! -L "$romsPath/gamecube" ]; then
       rm -rf "$romsPath/gc"
-      ln -sfn "$romsPath/gamecube" "$romsPath/gc" 
-      # Temporarily restores old directory structure. 
-    fi 
+      ln -sfn "$romsPath/gamecube" "$romsPath/gc"
+      # Temporarily restores old directory structure.
+    fi
 
     if [[ -L "$romsPath/gc" && ! $(readlink -f "$romsPath/gc") =~ ^"$romsPath" ]] || [[ -L "$romsPath/gamecube" && ! $(readlink -f "$romsPath/gamecube") =~ ^"$romsPath" ]]; then
         echo "User has symlinks that don't match expected paths located under $romsPath. Aborting symlink update."
@@ -338,21 +332,16 @@ Dolphin_flushSymlinks(){
 
     rsync -avh "$EMUDECKGIT/roms/gc/." "$romsPath/gc/." --ignore-existing
 
-    if [ -d "$toolsPath/downloaded_media/gc" ] && [ ! -d "$romsPath/gc/media" ]; then 
+    if [ -d "$toolsPath/downloaded_media/gc" ] && [ ! -d "$romsPath/gc/media" ]; then
       ln -s "$toolsPath/downloaded_media/gc" "$romsPath/gc/media"
     fi
 
     find "$STEAMPATH/userdata" -name "shortcuts.vdf" -exec sed -i "s|${romsPath}/gamecube|${romsPath}/gc|g" {} +
-		touch "$HOME/.config/EmuDeck/.dolphinsymlinks"	
+		touch "$HOME/.config/EmuDeck/.dolphinsymlinks"
 		echo "Dolphin symlink cleanup completed."
-    zenity --info \
-    --text="Dolphin symlinks have been cleaned. This cleanup was conducted to prevent any potential breakage with symlinks. Place all new ROMs in Emulation/roms/gc. Your ROMs have been moved from Emulation/roms/gamecube to Emulation/roms/gc." \
-    --title="Symlink Update" \
-    --width=400 \
-    --height=300
 
-  else 
+  else
   		echo "Dolphin symlinks already cleaned."
-  fi 
+  fi
 
 }

functions/EmuScripts/emuDeckLime3DS.sh

@@ -12,7 +12,7 @@ Lime3DS_texturesPath="$HOME/.config/lime3ds-emu/load/textures"
 Lime3DS_install(){
 	echo "Begin $Lime3DS_emuName Install"
 	local showProgress="$1"
-	if installEmuAI "$Lime3DS_emuName" "" "$(getReleaseURLGH "Lime3DS/Lime3DS" "tar.gz" "")" "lime3ds" "tar.gz" "emulator" "$showProgress"; then #lime3ds-gui.AppImage
+	if installEmuAI "$Lime3DS_emuName" "" "$(getReleaseURLGH "Lime3DS/lime3ds-archive" "tar.gz" "")" "lime3ds" "tar.gz" "emulator" "$showProgress"; then #lime3ds-gui.AppImage
 		mkdir "$HOME/Applications/lime3ds-temp"
 		tar -xvzf "$HOME/Applications/lime3ds.tar.gz" -C "$HOME/Applications/lime3ds-temp" --strip-components 1
 		if [ -f "$HOME/Applications/lime3ds-temp/lime3ds-gui.AppImage" ]; then

functions/helperFunctions.sh

@@ -1045,7 +1045,7 @@ function emulatorInit(){
 
 	#Check if the service is up and running
 
-	if [ -f "$cloud_sync_bin" ] && [ "$cloud_sync_status" == "true" ]; then
+	if [ -f "$cloud_sync_bin" ] && [ "$cloud_sync_status" == "true" ] && [ "$netPlay" != "true" ]; then
 
 		if [ $(check_internet_connection) == "true" ]; then
 

install.sh

@@ -6,9 +6,10 @@ sandbox=""
 if [ $linuxID = "Ubuntu" ]; then
     sandbox="--no-sandbox"
 fi
+clear
 
 if [ "$linuxID" == "SteamOS" ]; then
-    echo "installing EmuDeck"
+    echo "Installing EmuDeck"
 else
     zenityAvailable=$(command -v zenity &> /dev/null  && echo true)
 
@@ -110,4 +111,4 @@ mkdir -p ~/Applications
 curl -L "${EMUDECK_URL}" -o ~/Applications/EmuDeck.AppImage 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zenity --progress --title "Downloading EmuDeck" --width 600 --auto-close --no-cancel 2>/dev/null
 chmod +x ~/Applications/EmuDeck.AppImage
 ~/Applications/EmuDeck.AppImage $sandbox
-exit
+exit