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 1/4] 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 2/4] 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 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 3/4] 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 4/4] 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