From dc1c4467888a252467d4498300d542bfe46ac779 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Tue, 16 Jul 2024 09:35:44 -0400
Subject: [PATCH 01/21] Move unused /emu-configs/defaults/ folders to /old

---
 .../emu-configs}/defaults/citra/citra-qt-config.ini               | 0
 {emu-configs => old/emu-configs}/defaults/dolphin/Dolphin.ini     | 0
 {emu-configs => old/emu-configs}/defaults/dolphin/FreeLook.ini    | 0
 {emu-configs => old/emu-configs}/defaults/dolphin/GBA.ini         | 0
 {emu-configs => old/emu-configs}/defaults/dolphin/GCPadNew.ini    | 0
 {emu-configs => old/emu-configs}/defaults/dolphin/GFX.ini         | 0
 {emu-configs => old/emu-configs}/defaults/dolphin/Hotkeys.ini     | 0
 {emu-configs => old/emu-configs}/defaults/dolphin/Qt.ini          | 0
 {emu-configs => old/emu-configs}/defaults/dolphin/WiimoteNew.ini  | 0
 .../emu-configs}/defaults/duckstation/settings.ini                | 0
 {emu-configs => old/emu-configs}/defaults/melonds/melonDS.ini     | 0
 {emu-configs => old/emu-configs}/defaults/pcsx2-qt/PCSX2.ini      | 0
 {emu-configs => old/emu-configs}/defaults/ppsspp/controls.ini     | 0
 {emu-configs => old/emu-configs}/defaults/ppsspp/ppsspp.ini       | 0
 {emu-configs => old/emu-configs}/defaults/primehack/Dolphin.ini   | 0
 .../emu-configs}/defaults/primehack/FreeLookController.ini        | 0
 {emu-configs => old/emu-configs}/defaults/primehack/GBA.ini       | 0
 {emu-configs => old/emu-configs}/defaults/primehack/GCKeyNew.ini  | 0
 {emu-configs => old/emu-configs}/defaults/primehack/GCPadNew.ini  | 0
 {emu-configs => old/emu-configs}/defaults/primehack/Logger.ini    | 0
 {emu-configs => old/emu-configs}/defaults/primehack/Qt.ini        | 0
 .../emu-configs}/defaults/primehack/WiimoteNew.ini                | 0
 .../emu-configs}/defaults/retroarch/retroarch-core-options.cfg    | 0
 {emu-configs => old/emu-configs}/defaults/retroarch/retroarch.cfg | 0
 {emu-configs => old/emu-configs}/defaults/rpcs3/config.yml        | 0
 {emu-configs => old/emu-configs}/defaults/rpcs3/vfs.yml           | 0
 {emu-configs => old/emu-configs}/defaults/xemu/xemu.toml          | 0
 {emu-configs => old/emu-configs}/defaults/yuzu/qt-config.ini      | 0
 28 files changed, 0 insertions(+), 0 deletions(-)
 rename {emu-configs => old/emu-configs}/defaults/citra/citra-qt-config.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/dolphin/Dolphin.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/dolphin/FreeLook.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/dolphin/GBA.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/dolphin/GCPadNew.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/dolphin/GFX.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/dolphin/Hotkeys.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/dolphin/Qt.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/dolphin/WiimoteNew.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/duckstation/settings.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/melonds/melonDS.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/pcsx2-qt/PCSX2.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/ppsspp/controls.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/ppsspp/ppsspp.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/primehack/Dolphin.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/primehack/FreeLookController.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/primehack/GBA.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/primehack/GCKeyNew.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/primehack/GCPadNew.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/primehack/Logger.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/primehack/Qt.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/primehack/WiimoteNew.ini (100%)
 rename {emu-configs => old/emu-configs}/defaults/retroarch/retroarch-core-options.cfg (100%)
 rename {emu-configs => old/emu-configs}/defaults/retroarch/retroarch.cfg (100%)
 rename {emu-configs => old/emu-configs}/defaults/rpcs3/config.yml (100%)
 rename {emu-configs => old/emu-configs}/defaults/rpcs3/vfs.yml (100%)
 rename {emu-configs => old/emu-configs}/defaults/xemu/xemu.toml (100%)
 rename {emu-configs => old/emu-configs}/defaults/yuzu/qt-config.ini (100%)

diff --git a/emu-configs/defaults/citra/citra-qt-config.ini b/old/emu-configs/defaults/citra/citra-qt-config.ini
similarity index 100%
rename from emu-configs/defaults/citra/citra-qt-config.ini
rename to old/emu-configs/defaults/citra/citra-qt-config.ini
diff --git a/emu-configs/defaults/dolphin/Dolphin.ini b/old/emu-configs/defaults/dolphin/Dolphin.ini
similarity index 100%
rename from emu-configs/defaults/dolphin/Dolphin.ini
rename to old/emu-configs/defaults/dolphin/Dolphin.ini
diff --git a/emu-configs/defaults/dolphin/FreeLook.ini b/old/emu-configs/defaults/dolphin/FreeLook.ini
similarity index 100%
rename from emu-configs/defaults/dolphin/FreeLook.ini
rename to old/emu-configs/defaults/dolphin/FreeLook.ini
diff --git a/emu-configs/defaults/dolphin/GBA.ini b/old/emu-configs/defaults/dolphin/GBA.ini
similarity index 100%
rename from emu-configs/defaults/dolphin/GBA.ini
rename to old/emu-configs/defaults/dolphin/GBA.ini
diff --git a/emu-configs/defaults/dolphin/GCPadNew.ini b/old/emu-configs/defaults/dolphin/GCPadNew.ini
similarity index 100%
rename from emu-configs/defaults/dolphin/GCPadNew.ini
rename to old/emu-configs/defaults/dolphin/GCPadNew.ini
diff --git a/emu-configs/defaults/dolphin/GFX.ini b/old/emu-configs/defaults/dolphin/GFX.ini
similarity index 100%
rename from emu-configs/defaults/dolphin/GFX.ini
rename to old/emu-configs/defaults/dolphin/GFX.ini
diff --git a/emu-configs/defaults/dolphin/Hotkeys.ini b/old/emu-configs/defaults/dolphin/Hotkeys.ini
similarity index 100%
rename from emu-configs/defaults/dolphin/Hotkeys.ini
rename to old/emu-configs/defaults/dolphin/Hotkeys.ini
diff --git a/emu-configs/defaults/dolphin/Qt.ini b/old/emu-configs/defaults/dolphin/Qt.ini
similarity index 100%
rename from emu-configs/defaults/dolphin/Qt.ini
rename to old/emu-configs/defaults/dolphin/Qt.ini
diff --git a/emu-configs/defaults/dolphin/WiimoteNew.ini b/old/emu-configs/defaults/dolphin/WiimoteNew.ini
similarity index 100%
rename from emu-configs/defaults/dolphin/WiimoteNew.ini
rename to old/emu-configs/defaults/dolphin/WiimoteNew.ini
diff --git a/emu-configs/defaults/duckstation/settings.ini b/old/emu-configs/defaults/duckstation/settings.ini
similarity index 100%
rename from emu-configs/defaults/duckstation/settings.ini
rename to old/emu-configs/defaults/duckstation/settings.ini
diff --git a/emu-configs/defaults/melonds/melonDS.ini b/old/emu-configs/defaults/melonds/melonDS.ini
similarity index 100%
rename from emu-configs/defaults/melonds/melonDS.ini
rename to old/emu-configs/defaults/melonds/melonDS.ini
diff --git a/emu-configs/defaults/pcsx2-qt/PCSX2.ini b/old/emu-configs/defaults/pcsx2-qt/PCSX2.ini
similarity index 100%
rename from emu-configs/defaults/pcsx2-qt/PCSX2.ini
rename to old/emu-configs/defaults/pcsx2-qt/PCSX2.ini
diff --git a/emu-configs/defaults/ppsspp/controls.ini b/old/emu-configs/defaults/ppsspp/controls.ini
similarity index 100%
rename from emu-configs/defaults/ppsspp/controls.ini
rename to old/emu-configs/defaults/ppsspp/controls.ini
diff --git a/emu-configs/defaults/ppsspp/ppsspp.ini b/old/emu-configs/defaults/ppsspp/ppsspp.ini
similarity index 100%
rename from emu-configs/defaults/ppsspp/ppsspp.ini
rename to old/emu-configs/defaults/ppsspp/ppsspp.ini
diff --git a/emu-configs/defaults/primehack/Dolphin.ini b/old/emu-configs/defaults/primehack/Dolphin.ini
similarity index 100%
rename from emu-configs/defaults/primehack/Dolphin.ini
rename to old/emu-configs/defaults/primehack/Dolphin.ini
diff --git a/emu-configs/defaults/primehack/FreeLookController.ini b/old/emu-configs/defaults/primehack/FreeLookController.ini
similarity index 100%
rename from emu-configs/defaults/primehack/FreeLookController.ini
rename to old/emu-configs/defaults/primehack/FreeLookController.ini
diff --git a/emu-configs/defaults/primehack/GBA.ini b/old/emu-configs/defaults/primehack/GBA.ini
similarity index 100%
rename from emu-configs/defaults/primehack/GBA.ini
rename to old/emu-configs/defaults/primehack/GBA.ini
diff --git a/emu-configs/defaults/primehack/GCKeyNew.ini b/old/emu-configs/defaults/primehack/GCKeyNew.ini
similarity index 100%
rename from emu-configs/defaults/primehack/GCKeyNew.ini
rename to old/emu-configs/defaults/primehack/GCKeyNew.ini
diff --git a/emu-configs/defaults/primehack/GCPadNew.ini b/old/emu-configs/defaults/primehack/GCPadNew.ini
similarity index 100%
rename from emu-configs/defaults/primehack/GCPadNew.ini
rename to old/emu-configs/defaults/primehack/GCPadNew.ini
diff --git a/emu-configs/defaults/primehack/Logger.ini b/old/emu-configs/defaults/primehack/Logger.ini
similarity index 100%
rename from emu-configs/defaults/primehack/Logger.ini
rename to old/emu-configs/defaults/primehack/Logger.ini
diff --git a/emu-configs/defaults/primehack/Qt.ini b/old/emu-configs/defaults/primehack/Qt.ini
similarity index 100%
rename from emu-configs/defaults/primehack/Qt.ini
rename to old/emu-configs/defaults/primehack/Qt.ini
diff --git a/emu-configs/defaults/primehack/WiimoteNew.ini b/old/emu-configs/defaults/primehack/WiimoteNew.ini
similarity index 100%
rename from emu-configs/defaults/primehack/WiimoteNew.ini
rename to old/emu-configs/defaults/primehack/WiimoteNew.ini
diff --git a/emu-configs/defaults/retroarch/retroarch-core-options.cfg b/old/emu-configs/defaults/retroarch/retroarch-core-options.cfg
similarity index 100%
rename from emu-configs/defaults/retroarch/retroarch-core-options.cfg
rename to old/emu-configs/defaults/retroarch/retroarch-core-options.cfg
diff --git a/emu-configs/defaults/retroarch/retroarch.cfg b/old/emu-configs/defaults/retroarch/retroarch.cfg
similarity index 100%
rename from emu-configs/defaults/retroarch/retroarch.cfg
rename to old/emu-configs/defaults/retroarch/retroarch.cfg
diff --git a/emu-configs/defaults/rpcs3/config.yml b/old/emu-configs/defaults/rpcs3/config.yml
similarity index 100%
rename from emu-configs/defaults/rpcs3/config.yml
rename to old/emu-configs/defaults/rpcs3/config.yml
diff --git a/emu-configs/defaults/rpcs3/vfs.yml b/old/emu-configs/defaults/rpcs3/vfs.yml
similarity index 100%
rename from emu-configs/defaults/rpcs3/vfs.yml
rename to old/emu-configs/defaults/rpcs3/vfs.yml
diff --git a/emu-configs/defaults/xemu/xemu.toml b/old/emu-configs/defaults/xemu/xemu.toml
similarity index 100%
rename from emu-configs/defaults/xemu/xemu.toml
rename to old/emu-configs/defaults/xemu/xemu.toml
diff --git a/emu-configs/defaults/yuzu/qt-config.ini b/old/emu-configs/defaults/yuzu/qt-config.ini
similarity index 100%
rename from emu-configs/defaults/yuzu/qt-config.ini
rename to old/emu-configs/defaults/yuzu/qt-config.ini

From 297f8fe32919ecb5a6d82dcf8c52a2bccc6ae5f5 Mon Sep 17 00:00:00 2001
From: icenine451 <59938822+icenine451@users.noreply.github.com>
Date: Sun, 21 Jul 2024 18:33:24 -0400
Subject: [PATCH 02/21] Fix failed move commands in 0.8.2b post_update and add
 recovery for previous failed moves in 0.8.3b

---
 functions/post_update.sh | 43 +++++++++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/functions/post_update.sh b/functions/post_update.sh
index 39b18a27..c543cefb 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -304,7 +304,7 @@ post_update() {
     log i "In version 0.8.1b, the following changes were made that required config file updates/reset or other changes to the filesystem:"
     log i "- ES-DE files were moved inside the retrodeck folder, migrating to the new structure"
     log i "- Give the user the option to reset Ryujinx, which was not properly initialized in 0.8.0b"
-    
+
     log d "ES-DE files were moved inside the retrodeck folder, migrating to the new structure"
     dir_prep "$rdhome/ES-DE/collections" "/var/config/ES-DE/collections"
     dir_prep "$rdhome/ES-DE/gamelists" "/var/config/ES-DE/gamelists"
@@ -339,14 +339,39 @@ post_update() {
   fi
 
   if [[ $(check_version_is_older_than "0.8.2b") == "true" ]]; then
-      log i "Vita3K changed some paths, reflecting them: moving \"/var/data/Vita3K\" in \"/var/config/Vita3K\""
-      mv -f "/var/data/Vita3K" "/var/config/Vita3K"
-      log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug"
-      mv -f "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"
-      mv -f "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed"
-      mv -f "$rdhome/gamelists/"* "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed" && rm -rf "$rdhome/gamelists"
-      log i "Since in this version we moved to a PR build of Ryujinx we need to symlink it."
-      ln -sv $ryujinxconf "$(dirname $ryujinxconf)/PRConfig.json"
+    log i "Vita3K changed some paths, reflecting them: moving \"/var/data/Vita3K\" in \"/var/config/Vita3K\""
+    move "/var/data/Vita3K" "/var/config/Vita3K"
+    log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug"
+    move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"
+    move "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed"
+    move "$rdhome/gamelists" "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed"
+    log i "Since in this version we moved to a PR build of Ryujinx we need to symlink it."
+    ln -sv $ryujinxconf "$(dirname $ryujinxconf)/PRConfig.json"
+  fi
+
+  if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then
+    # In version 0.8.3b, the following changes were made:
+    # - Recovery from a failed move of the themes, downloaded_media and gamelists folder to their new ES-DE locations.
+    if [[ !-d "$rdhome/ES-DE/themes" || ! -d "$rdhome/ES-DE/downloaded_media" || ! -d "$rdhome/ES-DE/gamelists" ]]; then
+    log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug"
+      if [[ -d "$rdhome/themes" && ! -d "$rdhome/ES-DE/themes" ]]; then
+        move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"
+      else
+        log i "ES-DE themes appears to already have been migrated."
+      fi
+      if [[ -d "$rdhome/downloaded_media" && ! -d "$rdhome/ES-DE/downloaded_media" ]]; then
+        move "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed"
+      else
+        log i "ES-DE downloaded media appears to already have been migrated."
+      fi
+      if [[ -d "$rdhome/gamelists" && ! -d "$rdhome/ES-DE/gamelists" ]]; then
+        move "$rdhome/gamelists" "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed"
+      else
+        log i "ES-DE gamelists appears to already have been migrated."
+      fi
+    else
+      log i "ES-DE dfolders appears to already have been migrated."
+    fi
   fi
 
   # if [[ $(check_version_is_older_than "0.9.0b") == "true" ]]; then

From ffeef055aab13cc9a4148b0aabf7c82a12ab3dea Mon Sep 17 00:00:00 2001
From: icenine451 <59938822+icenine451@users.noreply.github.com>
Date: Sun, 21 Jul 2024 18:33:24 -0400
Subject: [PATCH 03/21] Fix failed move commands in 0.8.2b post_update and add
 recovery for previous failed moves in 0.8.3b

---
 functions/post_update.sh | 43 +++++++++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/functions/post_update.sh b/functions/post_update.sh
index 39b18a27..c543cefb 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -304,7 +304,7 @@ post_update() {
     log i "In version 0.8.1b, the following changes were made that required config file updates/reset or other changes to the filesystem:"
     log i "- ES-DE files were moved inside the retrodeck folder, migrating to the new structure"
     log i "- Give the user the option to reset Ryujinx, which was not properly initialized in 0.8.0b"
-    
+
     log d "ES-DE files were moved inside the retrodeck folder, migrating to the new structure"
     dir_prep "$rdhome/ES-DE/collections" "/var/config/ES-DE/collections"
     dir_prep "$rdhome/ES-DE/gamelists" "/var/config/ES-DE/gamelists"
@@ -339,14 +339,39 @@ post_update() {
   fi
 
   if [[ $(check_version_is_older_than "0.8.2b") == "true" ]]; then
-      log i "Vita3K changed some paths, reflecting them: moving \"/var/data/Vita3K\" in \"/var/config/Vita3K\""
-      mv -f "/var/data/Vita3K" "/var/config/Vita3K"
-      log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug"
-      mv -f "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"
-      mv -f "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed"
-      mv -f "$rdhome/gamelists/"* "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed" && rm -rf "$rdhome/gamelists"
-      log i "Since in this version we moved to a PR build of Ryujinx we need to symlink it."
-      ln -sv $ryujinxconf "$(dirname $ryujinxconf)/PRConfig.json"
+    log i "Vita3K changed some paths, reflecting them: moving \"/var/data/Vita3K\" in \"/var/config/Vita3K\""
+    move "/var/data/Vita3K" "/var/config/Vita3K"
+    log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug"
+    move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"
+    move "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed"
+    move "$rdhome/gamelists" "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed"
+    log i "Since in this version we moved to a PR build of Ryujinx we need to symlink it."
+    ln -sv $ryujinxconf "$(dirname $ryujinxconf)/PRConfig.json"
+  fi
+
+  if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then
+    # In version 0.8.3b, the following changes were made:
+    # - Recovery from a failed move of the themes, downloaded_media and gamelists folder to their new ES-DE locations.
+    if [[ !-d "$rdhome/ES-DE/themes" || ! -d "$rdhome/ES-DE/downloaded_media" || ! -d "$rdhome/ES-DE/gamelists" ]]; then
+    log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug"
+      if [[ -d "$rdhome/themes" && ! -d "$rdhome/ES-DE/themes" ]]; then
+        move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"
+      else
+        log i "ES-DE themes appears to already have been migrated."
+      fi
+      if [[ -d "$rdhome/downloaded_media" && ! -d "$rdhome/ES-DE/downloaded_media" ]]; then
+        move "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed"
+      else
+        log i "ES-DE downloaded media appears to already have been migrated."
+      fi
+      if [[ -d "$rdhome/gamelists" && ! -d "$rdhome/ES-DE/gamelists" ]]; then
+        move "$rdhome/gamelists" "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed"
+      else
+        log i "ES-DE gamelists appears to already have been migrated."
+      fi
+    else
+      log i "ES-DE dfolders appears to already have been migrated."
+    fi
   fi
 
   # if [[ $(check_version_is_older_than "0.9.0b") == "true" ]]; then

From 12ab63c22fdb63edbfc204ffb72075bafee7ef4f Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 22 Jul 2024 09:12:58 +0900
Subject: [PATCH 04/21] Init of 0.8.3b with folder move bufixes

---
 net.retrodeck.retrodeck.appdata.xml | 17 ++++++++++++++++-
 net.retrodeck.retrodeck.yml         |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index 01f47151..e34ea9da 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -67,6 +67,20 @@
    <project_license>GPL-3.0</project_license>
    <metadata_license>CC0-1.0</metadata_license>
    <releases>
+      <release version="0.8.3b" date="2024-07-22">
+         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.8.3b</url>
+         <description>
+            <p>Big fixes:</p>
+            <ul>
+               <li>Fixed a bug where the ES-DE folders where not correctly migrated from retrodeck folder to retrodeck/ES-DE folder</li>
+            </ul>
+            <p>Known issues:</p>
+            <ul>
+               <li>Ryujinx is broken in this version, we plan to fix it soon, check the known issues to learn more</li>
+               <li>Please check the know issues in the Wiki under General Information</li>
+            </ul>
+         </description>
+      </release>
       <release version="0.8.2b" date="2024-07-18">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.8.2b</url>
          <description>
@@ -89,7 +103,8 @@
             </ul>
             <p>Known issues:</p>
             <ul>
-               <li>Please check the know issues in the Wiki under General Information.</li>
+               <li>Ryujinx is broken in this version, we plan to fix it soon, check the known issues to learn more</li>
+               <li>Please check the know issues in the Wiki under General Information</li>
             </ul>
          </description>
       </release>
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 6f9c3182..9a756b69 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -78,7 +78,7 @@ modules:
 
         # on main please update this with the version variable, eg: VERSION=0.8.0b
         # on cooker will be THISBRANCH
-        VERSION=0.8.2b
+        VERSION=0.8.3b
 
         git checkout ${GITHUB_REF_NAME}
         mkdir -p ${FLATPAK_DEST}/retrodeck/

From 4e5e68638613a3a90f1a0adcfcc56eaa8909201d Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 22 Jul 2024 14:19:02 +0900
Subject: [PATCH 05/21] MANIFEST: forgot that we are in a cooker branch

---
 net.retrodeck.retrodeck.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 9a756b69..cbe1c5c1 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -78,7 +78,7 @@ modules:
 
         # on main please update this with the version variable, eg: VERSION=0.8.0b
         # on cooker will be THISBRANCH
-        VERSION=0.8.3b
+        VERSION=cooker-0.8.3b
 
         git checkout ${GITHUB_REF_NAME}
         mkdir -p ${FLATPAK_DEST}/retrodeck/

From de623f4ee194c25e9dbbd91a8480ed9cdae4713d Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 22 Jul 2024 14:23:08 +0900
Subject: [PATCH 06/21] POST_UPDATE: added collections folder

---
 functions/post_update.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/functions/post_update.sh b/functions/post_update.sh
index c543cefb..1dcb8ab1 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -352,7 +352,7 @@ post_update() {
   if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then
     # In version 0.8.3b, the following changes were made:
     # - Recovery from a failed move of the themes, downloaded_media and gamelists folder to their new ES-DE locations.
-    if [[ !-d "$rdhome/ES-DE/themes" || ! -d "$rdhome/ES-DE/downloaded_media" || ! -d "$rdhome/ES-DE/gamelists" ]]; then
+    if [[ !-d "$rdhome/ES-DE/themes" || ! -d "$rdhome/ES-DE/downloaded_media" || ! -d "$rdhome/ES-DE/gamelists" || ! -d "$rdhome/ES-DE/collections" ]]; then
     log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug"
       if [[ -d "$rdhome/themes" && ! -d "$rdhome/ES-DE/themes" ]]; then
         move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"
@@ -369,8 +369,13 @@ post_update() {
       else
         log i "ES-DE gamelists appears to already have been migrated."
       fi
+      if [[ -d "$rdhome/collections" && ! -d "$rdhome/ES-DE/collections" ]]; then
+        move "$rdhome/collections" "$rdhome/ES-DE/collections" && log d "Move of \"$rdhome/collections/\" completed"
+      else
+        log i "ES-DE collections appears to already have been migrated."
+      fi
     else
-      log i "ES-DE dfolders appears to already have been migrated."
+      log i "ES-DE folders appears to already have been migrated."
     fi
   fi
 

From ee628ae596e1aefe0dfad1dc7df9a2780a859d25 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 22 Jul 2024 14:41:35 +0900
Subject: [PATCH 07/21] WORKFLOW: added branch/cooker* to the triggers [skip
 ci[

---
 .github/workflows/cooker-selfhosted.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index 8dfc36fa..411662b5 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -5,6 +5,7 @@ on:
     branches:
      - cooker*
      - feat*
+     - branch/cooker*
     paths:
      - '.github/workflows/**'
      - 'automation_tools/**'

From 8984a4204da836b5009d611c106fafa642b953b7 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 22 Jul 2024 19:00:52 +0900
Subject: [PATCH 08/21] RYUJINX:TEST,  reverting to reported working version

---
 net.retrodeck.retrodeck.yml | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index cbe1c5c1..0cec04a9 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1232,21 +1232,34 @@ modules:
   #       url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1343/ryujinx-1.1.1343-linux_x64.tar.gz
   #       sha256: 3cd2172d2f42a0fb93a83bffe6bd8fb2d1d81fb45afc80e0068a245c8f755ac1
 
-  - name: Ryujinx-with-symlink-fix
+  # - name: Ryujinx-with-symlink-fix
+  #   buildsystem: simple
+  #   build-commands:
+  #     - |
+  #       mkdir -p ${FLATPAK_DEST}/ryujinx
+  #       mkdir -p ${FLATPAK_DEST}/bin
+  #       chmod +x Ryujinx.sh
+  #       chmod +x Ryujinx
+  #       mv -v * ${FLATPAK_DEST}/ryujinx
+  #       ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx.sh ${FLATPAK_DEST}/bin/Ryujinx.sh
+  #       chmod +x ${FLATPAK_DEST}/bin/Ryujinx.sh
+  #   sources:
+  #     - type: archive
+  #       url: https://gitlab.com/-/project/59825450/uploads/8519a04d7a3f5b5949f14b6ad25a4185/ryujinx-Release-1.1.0+81fd228-linux_x64.zip
+  #       sha256: 9e4a4393a3dcc44fda2aec40c2842492e30656c7369a9959d865a3351f12eeb9
+
+  # This version was reported as working with symlinks: https://discord.com/channels/951662718102962256/951715885968654418/1264882000658169866
+  - name: Ryujinx-reported-working-version
     buildsystem: simple
     build-commands:
       - |
-        mkdir -p ${FLATPAK_DEST}/ryujinx
-        mkdir -p ${FLATPAK_DEST}/bin
-        chmod +x Ryujinx.sh
-        chmod +x Ryujinx
-        mv -v * ${FLATPAK_DEST}/ryujinx
-        ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx.sh ${FLATPAK_DEST}/bin/Ryujinx.sh
-        chmod +x ${FLATPAK_DEST}/bin/Ryujinx.sh
+        tar -zxvf *.tar.gz
+        mv -v publish ${FLATPAK_DEST}/ryujinx
+        ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx.sh
     sources:
-      - type: archive
-        url: https://gitlab.com/-/project/59825450/uploads/8519a04d7a3f5b5949f14b6ad25a4185/ryujinx-Release-1.1.0+81fd228-linux_x64.zip
-        sha256: 9e4a4393a3dcc44fda2aec40c2842492e30656c7369a9959d865a3351f12eeb9
+      - type: file
+        url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1297/ryujinx-1.1.1297-linux_x64.tar.gz
+        sha256: 28b38754e7d2e92083b313b23278c180ae54ac025edbbd0276ec03baec0cec0f
 
   # Ryujinx Appimage - END
 

From ace0aa59ea26debea7476e8c9ca150df50d0c447 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Mon, 22 Jul 2024 09:43:15 -0400
Subject: [PATCH 09/21] More 0.8.3b ES-DE recovery

---
 functions/post_update.sh | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/functions/post_update.sh b/functions/post_update.sh
index ca482359..2d7f8532 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -345,6 +345,7 @@ post_update() {
     move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"
     move "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed"
     move "$rdhome/gamelists" "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed"
+    move "$rdhome/collections" "$rdhome/ES-DE/collections" && log d "Move of \"$rdhome/collections/\" completed"
     log i "Since in this version we moved to a PR build of Ryujinx we need to symlink it."
     ln -sv $ryujinxconf "$(dirname $ryujinxconf)/PRConfig.json"
   fi
@@ -352,24 +353,24 @@ post_update() {
   if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then
     # In version 0.8.3b, the following changes were made:
     # - Recovery from a failed move of the themes, downloaded_media and gamelists folder to their new ES-DE locations.
-    if [[ !-d "$rdhome/ES-DE/themes" || ! -d "$rdhome/ES-DE/downloaded_media" || ! -d "$rdhome/ES-DE/gamelists" || ! -d "$rdhome/ES-DE/collections" ]]; then
+    if [ ! -d "$rdhome/ES-DE/themes" ] || [ ! -d "$rdhome/ES-DE/downloaded_media" ] || [ ! -d "$rdhome/ES-DE/gamelists" ] || [ ! -d "$rdhome/ES-DE/collections" ]; then
     log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug"
-      if [[ -d "$rdhome/themes" && ! -d "$rdhome/ES-DE/themes" ]]; then
+      if [[ -d "$rdhome/themes" ]]; then
         move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"
       else
         log i "ES-DE themes appears to already have been migrated."
       fi
-      if [[ -d "$rdhome/downloaded_media" && ! -d "$rdhome/ES-DE/downloaded_media" ]]; then
+      if [[ -d "$rdhome/downloaded_media" ]]; then
         move "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed"
       else
         log i "ES-DE downloaded media appears to already have been migrated."
       fi
-      if [[ -d "$rdhome/gamelists" && ! -d "$rdhome/ES-DE/gamelists" ]]; then
+      if [[ -d "$rdhome/gamelists" ]]; then
         move "$rdhome/gamelists" "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed"
       else
         log i "ES-DE gamelists appears to already have been migrated."
       fi
-      if [[ -d "$rdhome/collections" && ! -d "$rdhome/ES-DE/collections" ]]; then
+      if [[ -d "$rdhome/collections" ]]; then
         move "$rdhome/collections" "$rdhome/ES-DE/collections" && log d "Move of \"$rdhome/collections/\" completed"
       else
         log i "ES-DE collections appears to already have been migrated."
@@ -379,31 +380,6 @@ post_update() {
     fi
   fi
 
-  if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then
-    # In version 0.8.3b, the following changes were made:
-    # - Recovery from a failed move of the themes, downloaded_media and gamelists folder to their new ES-DE locations.
-    if [[ !-d "$rdhome/ES-DE/themes" || ! -d "$rdhome/ES-DE/downloaded_media" || ! -d "$rdhome/ES-DE/gamelists" ]]; then
-    log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug"
-      if [[ -d "$rdhome/themes" && ! -d "$rdhome/ES-DE/themes" ]]; then
-        move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"
-      else
-        log i "ES-DE themes appears to already have been migrated."
-      fi
-      if [[ -d "$rdhome/downloaded_media" && ! -d "$rdhome/ES-DE/downloaded_media" ]]; then
-        move "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed"
-      else
-        log i "ES-DE downloaded media appears to already have been migrated."
-      fi
-      if [[ -d "$rdhome/gamelists" && ! -d "$rdhome/ES-DE/gamelists" ]]; then
-        move "$rdhome/gamelists" "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed"
-      else
-        log i "ES-DE gamelists appears to already have been migrated."
-      fi
-    else
-      log i "ES-DE dfolders appears to already have been migrated."
-    fi
-  fi
-
   # if [[ $(check_version_is_older_than "0.9.0b") == "true" ]]; then
   #   # Placeholder for version 0.9.0b
   #   rm /var/config/emulationstation/.emulationstation # remving the old symlink to .emulationstation as it might be not needed anymore

From b5c458b146df53328fbbb07a85605c9519bc5bdd Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Mon, 22 Jul 2024 09:44:35 -0400
Subject: [PATCH 10/21] Revert "Move unused /emu-configs/defaults/ folders to
 /old"

This reverts commit dc1c4467888a252467d4498300d542bfe46ac779.
---
 .../defaults/citra/citra-qt-config.ini                            | 0
 {old/emu-configs => emu-configs}/defaults/dolphin/Dolphin.ini     | 0
 {old/emu-configs => emu-configs}/defaults/dolphin/FreeLook.ini    | 0
 {old/emu-configs => emu-configs}/defaults/dolphin/GBA.ini         | 0
 {old/emu-configs => emu-configs}/defaults/dolphin/GCPadNew.ini    | 0
 {old/emu-configs => emu-configs}/defaults/dolphin/GFX.ini         | 0
 {old/emu-configs => emu-configs}/defaults/dolphin/Hotkeys.ini     | 0
 {old/emu-configs => emu-configs}/defaults/dolphin/Qt.ini          | 0
 {old/emu-configs => emu-configs}/defaults/dolphin/WiimoteNew.ini  | 0
 .../emu-configs => emu-configs}/defaults/duckstation/settings.ini | 0
 {old/emu-configs => emu-configs}/defaults/melonds/melonDS.ini     | 0
 {old/emu-configs => emu-configs}/defaults/pcsx2-qt/PCSX2.ini      | 0
 {old/emu-configs => emu-configs}/defaults/ppsspp/controls.ini     | 0
 {old/emu-configs => emu-configs}/defaults/ppsspp/ppsspp.ini       | 0
 {old/emu-configs => emu-configs}/defaults/primehack/Dolphin.ini   | 0
 .../defaults/primehack/FreeLookController.ini                     | 0
 {old/emu-configs => emu-configs}/defaults/primehack/GBA.ini       | 0
 {old/emu-configs => emu-configs}/defaults/primehack/GCKeyNew.ini  | 0
 {old/emu-configs => emu-configs}/defaults/primehack/GCPadNew.ini  | 0
 {old/emu-configs => emu-configs}/defaults/primehack/Logger.ini    | 0
 {old/emu-configs => emu-configs}/defaults/primehack/Qt.ini        | 0
 .../emu-configs => emu-configs}/defaults/primehack/WiimoteNew.ini | 0
 .../defaults/retroarch/retroarch-core-options.cfg                 | 0
 {old/emu-configs => emu-configs}/defaults/retroarch/retroarch.cfg | 0
 {old/emu-configs => emu-configs}/defaults/rpcs3/config.yml        | 0
 {old/emu-configs => emu-configs}/defaults/rpcs3/vfs.yml           | 0
 {old/emu-configs => emu-configs}/defaults/xemu/xemu.toml          | 0
 {old/emu-configs => emu-configs}/defaults/yuzu/qt-config.ini      | 0
 28 files changed, 0 insertions(+), 0 deletions(-)
 rename {old/emu-configs => emu-configs}/defaults/citra/citra-qt-config.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/dolphin/Dolphin.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/dolphin/FreeLook.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/dolphin/GBA.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/dolphin/GCPadNew.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/dolphin/GFX.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/dolphin/Hotkeys.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/dolphin/Qt.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/dolphin/WiimoteNew.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/duckstation/settings.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/melonds/melonDS.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/pcsx2-qt/PCSX2.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/ppsspp/controls.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/ppsspp/ppsspp.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/primehack/Dolphin.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/primehack/FreeLookController.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/primehack/GBA.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/primehack/GCKeyNew.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/primehack/GCPadNew.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/primehack/Logger.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/primehack/Qt.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/primehack/WiimoteNew.ini (100%)
 rename {old/emu-configs => emu-configs}/defaults/retroarch/retroarch-core-options.cfg (100%)
 rename {old/emu-configs => emu-configs}/defaults/retroarch/retroarch.cfg (100%)
 rename {old/emu-configs => emu-configs}/defaults/rpcs3/config.yml (100%)
 rename {old/emu-configs => emu-configs}/defaults/rpcs3/vfs.yml (100%)
 rename {old/emu-configs => emu-configs}/defaults/xemu/xemu.toml (100%)
 rename {old/emu-configs => emu-configs}/defaults/yuzu/qt-config.ini (100%)

diff --git a/old/emu-configs/defaults/citra/citra-qt-config.ini b/emu-configs/defaults/citra/citra-qt-config.ini
similarity index 100%
rename from old/emu-configs/defaults/citra/citra-qt-config.ini
rename to emu-configs/defaults/citra/citra-qt-config.ini
diff --git a/old/emu-configs/defaults/dolphin/Dolphin.ini b/emu-configs/defaults/dolphin/Dolphin.ini
similarity index 100%
rename from old/emu-configs/defaults/dolphin/Dolphin.ini
rename to emu-configs/defaults/dolphin/Dolphin.ini
diff --git a/old/emu-configs/defaults/dolphin/FreeLook.ini b/emu-configs/defaults/dolphin/FreeLook.ini
similarity index 100%
rename from old/emu-configs/defaults/dolphin/FreeLook.ini
rename to emu-configs/defaults/dolphin/FreeLook.ini
diff --git a/old/emu-configs/defaults/dolphin/GBA.ini b/emu-configs/defaults/dolphin/GBA.ini
similarity index 100%
rename from old/emu-configs/defaults/dolphin/GBA.ini
rename to emu-configs/defaults/dolphin/GBA.ini
diff --git a/old/emu-configs/defaults/dolphin/GCPadNew.ini b/emu-configs/defaults/dolphin/GCPadNew.ini
similarity index 100%
rename from old/emu-configs/defaults/dolphin/GCPadNew.ini
rename to emu-configs/defaults/dolphin/GCPadNew.ini
diff --git a/old/emu-configs/defaults/dolphin/GFX.ini b/emu-configs/defaults/dolphin/GFX.ini
similarity index 100%
rename from old/emu-configs/defaults/dolphin/GFX.ini
rename to emu-configs/defaults/dolphin/GFX.ini
diff --git a/old/emu-configs/defaults/dolphin/Hotkeys.ini b/emu-configs/defaults/dolphin/Hotkeys.ini
similarity index 100%
rename from old/emu-configs/defaults/dolphin/Hotkeys.ini
rename to emu-configs/defaults/dolphin/Hotkeys.ini
diff --git a/old/emu-configs/defaults/dolphin/Qt.ini b/emu-configs/defaults/dolphin/Qt.ini
similarity index 100%
rename from old/emu-configs/defaults/dolphin/Qt.ini
rename to emu-configs/defaults/dolphin/Qt.ini
diff --git a/old/emu-configs/defaults/dolphin/WiimoteNew.ini b/emu-configs/defaults/dolphin/WiimoteNew.ini
similarity index 100%
rename from old/emu-configs/defaults/dolphin/WiimoteNew.ini
rename to emu-configs/defaults/dolphin/WiimoteNew.ini
diff --git a/old/emu-configs/defaults/duckstation/settings.ini b/emu-configs/defaults/duckstation/settings.ini
similarity index 100%
rename from old/emu-configs/defaults/duckstation/settings.ini
rename to emu-configs/defaults/duckstation/settings.ini
diff --git a/old/emu-configs/defaults/melonds/melonDS.ini b/emu-configs/defaults/melonds/melonDS.ini
similarity index 100%
rename from old/emu-configs/defaults/melonds/melonDS.ini
rename to emu-configs/defaults/melonds/melonDS.ini
diff --git a/old/emu-configs/defaults/pcsx2-qt/PCSX2.ini b/emu-configs/defaults/pcsx2-qt/PCSX2.ini
similarity index 100%
rename from old/emu-configs/defaults/pcsx2-qt/PCSX2.ini
rename to emu-configs/defaults/pcsx2-qt/PCSX2.ini
diff --git a/old/emu-configs/defaults/ppsspp/controls.ini b/emu-configs/defaults/ppsspp/controls.ini
similarity index 100%
rename from old/emu-configs/defaults/ppsspp/controls.ini
rename to emu-configs/defaults/ppsspp/controls.ini
diff --git a/old/emu-configs/defaults/ppsspp/ppsspp.ini b/emu-configs/defaults/ppsspp/ppsspp.ini
similarity index 100%
rename from old/emu-configs/defaults/ppsspp/ppsspp.ini
rename to emu-configs/defaults/ppsspp/ppsspp.ini
diff --git a/old/emu-configs/defaults/primehack/Dolphin.ini b/emu-configs/defaults/primehack/Dolphin.ini
similarity index 100%
rename from old/emu-configs/defaults/primehack/Dolphin.ini
rename to emu-configs/defaults/primehack/Dolphin.ini
diff --git a/old/emu-configs/defaults/primehack/FreeLookController.ini b/emu-configs/defaults/primehack/FreeLookController.ini
similarity index 100%
rename from old/emu-configs/defaults/primehack/FreeLookController.ini
rename to emu-configs/defaults/primehack/FreeLookController.ini
diff --git a/old/emu-configs/defaults/primehack/GBA.ini b/emu-configs/defaults/primehack/GBA.ini
similarity index 100%
rename from old/emu-configs/defaults/primehack/GBA.ini
rename to emu-configs/defaults/primehack/GBA.ini
diff --git a/old/emu-configs/defaults/primehack/GCKeyNew.ini b/emu-configs/defaults/primehack/GCKeyNew.ini
similarity index 100%
rename from old/emu-configs/defaults/primehack/GCKeyNew.ini
rename to emu-configs/defaults/primehack/GCKeyNew.ini
diff --git a/old/emu-configs/defaults/primehack/GCPadNew.ini b/emu-configs/defaults/primehack/GCPadNew.ini
similarity index 100%
rename from old/emu-configs/defaults/primehack/GCPadNew.ini
rename to emu-configs/defaults/primehack/GCPadNew.ini
diff --git a/old/emu-configs/defaults/primehack/Logger.ini b/emu-configs/defaults/primehack/Logger.ini
similarity index 100%
rename from old/emu-configs/defaults/primehack/Logger.ini
rename to emu-configs/defaults/primehack/Logger.ini
diff --git a/old/emu-configs/defaults/primehack/Qt.ini b/emu-configs/defaults/primehack/Qt.ini
similarity index 100%
rename from old/emu-configs/defaults/primehack/Qt.ini
rename to emu-configs/defaults/primehack/Qt.ini
diff --git a/old/emu-configs/defaults/primehack/WiimoteNew.ini b/emu-configs/defaults/primehack/WiimoteNew.ini
similarity index 100%
rename from old/emu-configs/defaults/primehack/WiimoteNew.ini
rename to emu-configs/defaults/primehack/WiimoteNew.ini
diff --git a/old/emu-configs/defaults/retroarch/retroarch-core-options.cfg b/emu-configs/defaults/retroarch/retroarch-core-options.cfg
similarity index 100%
rename from old/emu-configs/defaults/retroarch/retroarch-core-options.cfg
rename to emu-configs/defaults/retroarch/retroarch-core-options.cfg
diff --git a/old/emu-configs/defaults/retroarch/retroarch.cfg b/emu-configs/defaults/retroarch/retroarch.cfg
similarity index 100%
rename from old/emu-configs/defaults/retroarch/retroarch.cfg
rename to emu-configs/defaults/retroarch/retroarch.cfg
diff --git a/old/emu-configs/defaults/rpcs3/config.yml b/emu-configs/defaults/rpcs3/config.yml
similarity index 100%
rename from old/emu-configs/defaults/rpcs3/config.yml
rename to emu-configs/defaults/rpcs3/config.yml
diff --git a/old/emu-configs/defaults/rpcs3/vfs.yml b/emu-configs/defaults/rpcs3/vfs.yml
similarity index 100%
rename from old/emu-configs/defaults/rpcs3/vfs.yml
rename to emu-configs/defaults/rpcs3/vfs.yml
diff --git a/old/emu-configs/defaults/xemu/xemu.toml b/emu-configs/defaults/xemu/xemu.toml
similarity index 100%
rename from old/emu-configs/defaults/xemu/xemu.toml
rename to emu-configs/defaults/xemu/xemu.toml
diff --git a/old/emu-configs/defaults/yuzu/qt-config.ini b/emu-configs/defaults/yuzu/qt-config.ini
similarity index 100%
rename from old/emu-configs/defaults/yuzu/qt-config.ini
rename to emu-configs/defaults/yuzu/qt-config.ini

From cc778fac20a54fb1e4daba1f2d8643f8471b2d11 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Mon, 22 Jul 2024 10:38:13 -0400
Subject: [PATCH 11/21] Include more ES-DE folders in backup function

---
 functions/other_functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions/other_functions.sh b/functions/other_functions.sh
index 703727a7..ca1c3fb4 100644
--- a/functions/other_functions.sh
+++ b/functions/other_functions.sh
@@ -307,7 +307,7 @@ update_vita3k_firmware() {
 
 backup_retrodeck_userdata() {
   create_dir "$backups_folder"
-  zip -rq9 "$backups_folder/$(date +"%0m%0d")_retrodeck_userdata.zip" "$saves_folder" "$states_folder" "$bios_folder" "$media_folder" "$themes_folder" "$logs_folder" "$screenshots_folder" "$mods_folder" "$texture_packs_folder" "$borders_folder" > $logs_folder/$(date +"%0m%0d")_backup_log.log
+  zip -rq9 "$backups_folder/$(date +"%0m%0d")_retrodeck_userdata.zip" "$saves_folder" "$states_folder" "$bios_folder" "$media_folder" "$themes_folder" "$rdhome/ES-DE/collections" "$rdhome/ES-DE/gamelists" "$logs_folder" "$screenshots_folder" "$mods_folder" "$texture_packs_folder" "$borders_folder" > $logs_folder/$(date +"%0m%0d")_backup_log.log
 }
 
 make_name_pretty() {

From eca90f8e609e6e39346e411ee566025fd5f8f0b9 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Tue, 23 Jul 2024 08:55:01 -0400
Subject: [PATCH 12/21] Change incorrect ES-DE migration folder detection logic

---
 functions/post_update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions/post_update.sh b/functions/post_update.sh
index 2d7f8532..571242a7 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -353,7 +353,7 @@ post_update() {
   if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then
     # In version 0.8.3b, the following changes were made:
     # - Recovery from a failed move of the themes, downloaded_media and gamelists folder to their new ES-DE locations.
-    if [ ! -d "$rdhome/ES-DE/themes" ] || [ ! -d "$rdhome/ES-DE/downloaded_media" ] || [ ! -d "$rdhome/ES-DE/gamelists" ] || [ ! -d "$rdhome/ES-DE/collections" ]; then
+    if [ -d "$rdhome/themes" ] || [ -d "$rdhome/downloaded_media" ] || [ -d "$rdhome/gamelists" ] || [ -d "$rdhome/collections" ]; then
     log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug"
       if [[ -d "$rdhome/themes" ]]; then
         move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"

From a039037bd2d28fda1165756847075399ddfc842b Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Wed, 24 Jul 2024 22:14:51 +0900
Subject: [PATCH 13/21] POST_UPDATE: nasking the users to move the ES-DE
 folders

---
 functions/post_update.sh | 67 +++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 25 deletions(-)

diff --git a/functions/post_update.sh b/functions/post_update.sh
index 571242a7..629d3bd5 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -350,35 +350,52 @@ post_update() {
     ln -sv $ryujinxconf "$(dirname $ryujinxconf)/PRConfig.json"
   fi
 
-  if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then
-    # In version 0.8.3b, the following changes were made:
-    # - Recovery from a failed move of the themes, downloaded_media and gamelists folder to their new ES-DE locations.
-    if [ -d "$rdhome/themes" ] || [ -d "$rdhome/downloaded_media" ] || [ -d "$rdhome/gamelists" ] || [ -d "$rdhome/collections" ]; then
+if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then
+  # In version 0.8.3b, the following changes were made:
+  # - Recovery from a failed move of the themes, downloaded_media and gamelists folder to their new ES-DE locations.
+  
+  # Check if any of the directories exist
+  if [ -d "$rdhome/themes" ] || [ -d "$rdhome/downloaded_media" ] || [ -d "$rdhome/gamelists" ] || [ -d "$rdhome/collections" ]; then
     log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug"
-      if [[ -d "$rdhome/themes" ]]; then
-        move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"
-      else
-        log i "ES-DE themes appears to already have been migrated."
-      fi
-      if [[ -d "$rdhome/downloaded_media" ]]; then
-        move "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed"
-      else
-        log i "ES-DE downloaded media appears to already have been migrated."
-      fi
-      if [[ -d "$rdhome/gamelists" ]]; then
-        move "$rdhome/gamelists" "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed"
-      else
-        log i "ES-DE gamelists appears to already have been migrated."
-      fi
-      if [[ -d "$rdhome/collections" ]]; then
-        move "$rdhome/collections" "$rdhome/ES-DE/collections" && log d "Move of \"$rdhome/collections/\" completed"
-      else
-        log i "ES-DE collections appears to already have been migrated."
-      fi
+
+    # Ask user if they want to move and overwrite the data
+    if [[ $(configurator_generic_question_dialog "Move Data" "IN the previous version some user suddered a bug where ES-DE appeared empty (no scraped data or collections for example).\nYour data is not gone, it's just in a different path.\n\nDo you want to recover your old data replacing the actual one?") == "true" ]]; then
+      move_cmd="mv -f"  # Use mv with overwrite
+      log i "User chose to move and overwrite the data."
     else
-      log i "ES-DE folders appears to already have been migrated."
+      move_cmd="move"  # Use existing move function
+      log i "User chose to move the data without overwriting."
     fi
+
+    # Move each directory if it exists
+    if [[ -d "$rdhome/themes" ]]; then
+      $move_cmd "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"
+    else
+      log i "ES-DE themes appears to already have been migrated."
+    fi
+
+    if [[ -d "$rdhome/downloaded_media" ]]; then
+      $move_cmd "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed"
+    else
+      log i "ES-DE downloaded media appears to already have been migrated."
+    fi
+
+    if [[ -d "$rdhome/gamelists" ]]; then
+      $move_cmd "$rdhome/gamelists" "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed"
+    else
+      log i "ES-DE gamelists appears to already have been migrated."
+    fi
+
+    if [[ -d "$rdhome/collections" ]]; then
+      $move_cmd "$rdhome/collections" "$rdhome/ES-DE/collections" && log d "Move of \"$rdhome/collections/\" completed"
+    else
+      log i "ES-DE collections appears to already have been migrated."
+    fi
+  else
+    log i "ES-DE folders appears to already have been migrated."
   fi
+fi
+
 
   # if [[ $(check_version_is_older_than "0.9.0b") == "true" ]]; then
   #   # Placeholder for version 0.9.0b

From c5bff3fe6b2aa0af14eb066e2a76d0f102d36f83 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Wed, 24 Jul 2024 22:36:58 +0900
Subject: [PATCH 14/21] POST_UPDATE: ask the user if they want to overwrite the
 data

---
 functions/post_update.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions/post_update.sh b/functions/post_update.sh
index 629d3bd5..d7601d57 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -214,7 +214,7 @@ post_update() {
 
     prepare_component "reset" "pico8"
 
-    configurator_generic_dialog "RetroDECK 0.7.0b Upgrade" "Would you like to install the official controller profile?\n(this will reset your custom emulator settings)\n\nAfter installation you can enable it from from Controller Settings -> Templates."
+    configurator_generic_dialog "RetroDECK 0.7.0b Upgrade" "Would you like to install the official controller profile?\n(this will reset your custom emulator settings)\n\nAfter installation you can enable it from from Controller Settings\t->\tTemplates."
     if [[ $(configurator_generic_question_dialog "RetroDECK Official Controller Profile" "Would you like to install the official RetroDECK controller profile?") == "true" ]]; then
       install_retrodeck_controller_profile
       prepare_component "reset" "all"
@@ -359,7 +359,7 @@ if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then
     log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug"
 
     # Ask user if they want to move and overwrite the data
-    if [[ $(configurator_generic_question_dialog "Move Data" "IN the previous version some user suddered a bug where ES-DE appeared empty (no scraped data or collections for example).\nYour data is not gone, it's just in a different path.\n\nDo you want to recover your old data replacing the actual one?") == "true" ]]; then
+    if [[ $(configurator_generic_question_dialog "Move Data" "In the previous version some users suffered a bug where ES-DE appeared empty (no scraped data or collections for example).\n\n<span foreground='$purple' size='larger'><b>Your data is not gone!</b></span>\n\nit's just in a different path.\n\nDo you want to recover your old data replacing the actual one?\nBy choosing no instead, the folder with be moved but no data will be replaced and it will be availalbe in the retrodeck folder.\n\nThe affected folders are:\n\nretrodeck/themes\t\t\t\t->\tretrodeck/ES-DE/themes\nretrodeck/downloaded_media\t->\tretrodeck/ES-DE/downloaded_media\nretrodeck/gamelists\t\t\t\t->\tretrodeck/ES-DE/gamelist\nretrodeck/collections\t\t\t->\tretrodeck/ES-DE/collections") == "true" ]]; then
       move_cmd="mv -f"  # Use mv with overwrite
       log i "User chose to move and overwrite the data."
     else

From e875579159f59d7087064ac00ab1a29ff5964a23 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Wed, 24 Jul 2024 22:40:26 +0900
Subject: [PATCH 15/21] APPDATA: updated [skip ci]

---
 net.retrodeck.retrodeck.appdata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index e34ea9da..ca460932 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -70,13 +70,13 @@
       <release version="0.8.3b" date="2024-07-22">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.8.3b</url>
          <description>
-            <p>Big fixes:</p>
+            <p>Bug fixes:</p>
             <ul>
-               <li>Fixed a bug where the ES-DE folders where not correctly migrated from retrodeck folder to retrodeck/ES-DE folder</li>
+               <li>FRAMEWORK: Fixed a bug where the ES-DE folders where not correctly migrated from retrodeck folder to retrodeck/ES-DE folder</li>
+               <li>RYUJINX: reverted it to an older version without the symlink bug</li>
             </ul>
             <p>Known issues:</p>
             <ul>
-               <li>Ryujinx is broken in this version, we plan to fix it soon, check the known issues to learn more</li>
                <li>Please check the know issues in the Wiki under General Information</li>
             </ul>
          </description>

From ad8a27126540f214b1c1d25f0b27fbd55b622a92 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 26 Jul 2024 17:11:34 +0900
Subject: [PATCH 16/21] POST_UPDATE: fixed directory move

---
 functions/post_update.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/functions/post_update.sh b/functions/post_update.sh
index d7601d57..94687adb 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -369,25 +369,25 @@ if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then
 
     # Move each directory if it exists
     if [[ -d "$rdhome/themes" ]]; then
-      $move_cmd "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"
+      $move_cmd "$rdhome/themes" "$rdhome/ES-DE/" && log d "Move of \"$rdhome/themes\" completed"
     else
       log i "ES-DE themes appears to already have been migrated."
     fi
 
     if [[ -d "$rdhome/downloaded_media" ]]; then
-      $move_cmd "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed"
+      $move_cmd "$rdhome/downloaded_media" "$rdhome/ES-DE/" && log d "Move of \"$rdhome/downloaded_media\" completed"
     else
       log i "ES-DE downloaded media appears to already have been migrated."
     fi
 
     if [[ -d "$rdhome/gamelists" ]]; then
-      $move_cmd "$rdhome/gamelists" "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed"
+      $move_cmd "$rdhome/gamelists" "$rdhome/ES-DE/" && log d "Move of \"$rdhome/gamelists/\" completed"
     else
       log i "ES-DE gamelists appears to already have been migrated."
     fi
 
     if [[ -d "$rdhome/collections" ]]; then
-      $move_cmd "$rdhome/collections" "$rdhome/ES-DE/collections" && log d "Move of \"$rdhome/collections/\" completed"
+      $move_cmd "$rdhome/collections" "$rdhome/ES-DE/" && log d "Move of \"$rdhome/collections/\" completed"
     else
       log i "ES-DE collections appears to already have been migrated."
     fi

From ca8b96f27d9336ec76a37ae4cda084cc8d7f1dff Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 26 Jul 2024 17:43:13 +0900
Subject: [PATCH 17/21] POST_UPDATE: refreshing ES-DE paths in the config

---
 functions/post_update.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/functions/post_update.sh b/functions/post_update.sh
index 94687adb..002d395c 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -394,6 +394,10 @@ if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then
   else
     log i "ES-DE folders appears to already have been migrated."
   fi
+  # Better to refresh the paths
+  set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings"
+  set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings"
+  set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings"
 fi
 
 

From 3e9325c52170d8be7627c26f030611461adae426 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 29 Jul 2024 18:03:48 +0900
Subject: [PATCH 18/21] RYUJINX: testing a newer PR build with more fixes

---
 net.retrodeck.retrodeck.yml | 48 ++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 0cec04a9..d6969b1c 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1232,34 +1232,34 @@ modules:
   #       url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1343/ryujinx-1.1.1343-linux_x64.tar.gz
   #       sha256: 3cd2172d2f42a0fb93a83bffe6bd8fb2d1d81fb45afc80e0068a245c8f755ac1
 
-  # - name: Ryujinx-with-symlink-fix
-  #   buildsystem: simple
-  #   build-commands:
-  #     - |
-  #       mkdir -p ${FLATPAK_DEST}/ryujinx
-  #       mkdir -p ${FLATPAK_DEST}/bin
-  #       chmod +x Ryujinx.sh
-  #       chmod +x Ryujinx
-  #       mv -v * ${FLATPAK_DEST}/ryujinx
-  #       ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx.sh ${FLATPAK_DEST}/bin/Ryujinx.sh
-  #       chmod +x ${FLATPAK_DEST}/bin/Ryujinx.sh
-  #   sources:
-  #     - type: archive
-  #       url: https://gitlab.com/-/project/59825450/uploads/8519a04d7a3f5b5949f14b6ad25a4185/ryujinx-Release-1.1.0+81fd228-linux_x64.zip
-  #       sha256: 9e4a4393a3dcc44fda2aec40c2842492e30656c7369a9959d865a3351f12eeb9
-
-  # This version was reported as working with symlinks: https://discord.com/channels/951662718102962256/951715885968654418/1264882000658169866
-  - name: Ryujinx-reported-working-version
+  - name: Ryujinx-with-symlink-fix
     buildsystem: simple
     build-commands:
       - |
-        tar -zxvf *.tar.gz
-        mv -v publish ${FLATPAK_DEST}/ryujinx
-        ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx.sh
+        mkdir -p ${FLATPAK_DEST}/ryujinx
+        mkdir -p ${FLATPAK_DEST}/bin
+        chmod +x Ryujinx.sh
+        chmod +x Ryujinx
+        mv -v * ${FLATPAK_DEST}/ryujinx
+        ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx.sh ${FLATPAK_DEST}/bin/Ryujinx.sh
+        chmod +x ${FLATPAK_DEST}/bin/Ryujinx.sh
     sources:
-      - type: file
-        url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1297/ryujinx-1.1.1297-linux_x64.tar.gz
-        sha256: 28b38754e7d2e92083b313b23278c180ae54ac025edbbd0276ec03baec0cec0f
+      - type: archive
+        url: https://gitlab.com/-/project/59825450/uploads/a512ffca03dea9a687a7c3048dc1fd00/ryujinx-Release-1.1.0+56c8844-linux_x64.zip
+        sha256: 890f82146d6847efaf480d63867f439d58f28261e9070a4790f77eab9be16e6b
+
+  # This version was reported as working with symlinks: https://discord.com/channels/951662718102962256/951715885968654418/1264882000658169866
+  # - name: Ryujinx-reported-working-version
+  #   buildsystem: simple
+  #   build-commands:
+  #     - |
+  #       tar -zxvf *.tar.gz
+  #       mv -v publish ${FLATPAK_DEST}/ryujinx
+  #       ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx.sh
+  #   sources:
+  #     - type: file
+  #       url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1297/ryujinx-1.1.1297-linux_x64.tar.gz
+  #       sha256: 28b38754e7d2e92083b313b23278c180ae54ac025edbbd0276ec03baec0cec0f
 
   # Ryujinx Appimage - END
 

From 85f5871964151894b1c0b79575f0544585b6f53b Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Mon, 29 Jul 2024 08:48:58 -0400
Subject: [PATCH 19/21] Update retrodeck prepare_component to accomodate
 subfolders in retrodeck.cfg paths

---
 functions/prepare_component.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index 306389f2..c540de97 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -26,7 +26,7 @@ prepare_component() {
           declare -g "$current_setting_name=$rdhome/${current_setting_value#*retrodeck/}" #removes everything until "retrodeck" and adds the actual retrodeck folder
           log d "Setting: $current_setting_name=$current_setting_value"
           if [[ ! $current_setting_name == "logs_folder" ]]; then # Don't create a logs folder normally, we want to maintain the current files exactly to not lose early-install logs.
-            create_dir "$rdhome/$(basename $current_setting_value)"
+            create_dir "$rdhome/${current_setting_value#*retrodeck/}"
           else # Log folder-specific actions
             mv "$rd_logs_folder" "$logs_folder" # Move existing logs folder from internal to userland
             ln -sf "$logs_folder" "$rd_logs_folder" # Link userland logs folder back to statically-written location
@@ -42,8 +42,8 @@ prepare_component() {
         local current_setting_name=$(get_setting_name "$config_line" "retrodeck")
         if [[ ! $current_setting_name =~ (rdhome|sdcard) ]]; then # Ignore these locations
           local current_setting_value=$(get_setting_value "$rd_conf" "$current_setting_name" "retrodeck" "paths")
-          if [[ -d "$rdhome/$(basename $current_setting_value)" ]]; then # If the folder exists at the new ~/retrodeck location
-              declare -g "$current_setting_name=$rdhome/$(basename $current_setting_value)"
+          if [[ -d "$rdhome/${current_setting_value#*retrodeck/}" ]]; then # If the folder exists at the new ~/retrodeck location
+              declare -g "$current_setting_name=$rdhome/${current_setting_value#*retrodeck/}"
           fi
         fi
       done < <(grep -v '^\s*$' $rd_conf | awk '/^\[paths\]/{f=1;next} /^\[/{f=0} f')

From 98cc6ec47008092976dda48162f8195898c80d92 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 29 Jul 2024 23:16:43 +0900
Subject: [PATCH 20/21] RYUJINX: restored the previous version after testing a
 new PR

---
 net.retrodeck.retrodeck.yml | 48 ++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index d6969b1c..ed5c22fe 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1232,34 +1232,34 @@ modules:
   #       url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1343/ryujinx-1.1.1343-linux_x64.tar.gz
   #       sha256: 3cd2172d2f42a0fb93a83bffe6bd8fb2d1d81fb45afc80e0068a245c8f755ac1
 
-  - name: Ryujinx-with-symlink-fix
-    buildsystem: simple
-    build-commands:
-      - |
-        mkdir -p ${FLATPAK_DEST}/ryujinx
-        mkdir -p ${FLATPAK_DEST}/bin
-        chmod +x Ryujinx.sh
-        chmod +x Ryujinx
-        mv -v * ${FLATPAK_DEST}/ryujinx
-        ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx.sh ${FLATPAK_DEST}/bin/Ryujinx.sh
-        chmod +x ${FLATPAK_DEST}/bin/Ryujinx.sh
-    sources:
-      - type: archive
-        url: https://gitlab.com/-/project/59825450/uploads/a512ffca03dea9a687a7c3048dc1fd00/ryujinx-Release-1.1.0+56c8844-linux_x64.zip
-        sha256: 890f82146d6847efaf480d63867f439d58f28261e9070a4790f77eab9be16e6b
-
-  # This version was reported as working with symlinks: https://discord.com/channels/951662718102962256/951715885968654418/1264882000658169866
-  # - name: Ryujinx-reported-working-version
+  # - name: Ryujinx-with-symlink-fix
   #   buildsystem: simple
   #   build-commands:
   #     - |
-  #       tar -zxvf *.tar.gz
-  #       mv -v publish ${FLATPAK_DEST}/ryujinx
-  #       ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx.sh
+  #       mkdir -p ${FLATPAK_DEST}/ryujinx
+  #       mkdir -p ${FLATPAK_DEST}/bin
+  #       chmod +x Ryujinx.sh
+  #       chmod +x Ryujinx
+  #       mv -v * ${FLATPAK_DEST}/ryujinx
+  #       ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx.sh ${FLATPAK_DEST}/bin/Ryujinx.sh
+  #       chmod +x ${FLATPAK_DEST}/bin/Ryujinx.sh
   #   sources:
-  #     - type: file
-  #       url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1297/ryujinx-1.1.1297-linux_x64.tar.gz
-  #       sha256: 28b38754e7d2e92083b313b23278c180ae54ac025edbbd0276ec03baec0cec0f
+  #     - type: archive
+  #       url: https://gitlab.com/-/project/59825450/uploads/a512ffca03dea9a687a7c3048dc1fd00/ryujinx-Release-1.1.0+56c8844-linux_x64.zip
+  #       sha256: 890f82146d6847efaf480d63867f439d58f28261e9070a4790f77eab9be16e6b
+
+  # This version was reported as working with symlinks: https://discord.com/channels/951662718102962256/951715885968654418/1264882000658169866
+  - name: Ryujinx-reported-working-version
+    buildsystem: simple
+    build-commands:
+      - |
+        tar -zxvf *.tar.gz
+        mv -v publish ${FLATPAK_DEST}/ryujinx
+        ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx.sh
+    sources:
+      - type: file
+        url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1297/ryujinx-1.1.1297-linux_x64.tar.gz
+        sha256: 28b38754e7d2e92083b313b23278c180ae54ac025edbbd0276ec03baec0cec0f
 
   # Ryujinx Appimage - END
 

From 54cfb394bda5ef0b03b2b7f4353d6353ba7cfdf4 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Wed, 31 Jul 2024 21:24:15 +0900
Subject: [PATCH 21/21] APPDATA: updated [skip ci]

---
 net.retrodeck.retrodeck.appdata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index ca460932..c8d6445e 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -67,12 +67,12 @@
    <project_license>GPL-3.0</project_license>
    <metadata_license>CC0-1.0</metadata_license>
    <releases>
-      <release version="0.8.3b" date="2024-07-22">
+      <release version="0.8.3b" date="2024-07-31">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.8.3b</url>
          <description>
             <p>Bug fixes:</p>
             <ul>
-               <li>FRAMEWORK: Fixed a bug where the ES-DE folders where not correctly migrated from retrodeck folder to retrodeck/ES-DE folder</li>
+               <li>FRAMEWORK: Fixed a bug where the ES-DE folders were not correctly migrated from retrodeck folder to retrodeck/ES-DE folder</li>
                <li>RYUJINX: reverted it to an older version without the symlink bug</li>
             </ul>
             <p>Known issues:</p>