From 622127b70b9bdb7eb3fdadec54716d732ff6f6d4 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sat, 20 Jul 2024 23:39:10 +0900
Subject: [PATCH 1/2] SAVE_MIGRATION: quoted some paths [skip ci]

---
 functions/050_save_migration.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/functions/050_save_migration.sh b/functions/050_save_migration.sh
index ccb22aef..4eaf7dc0 100644
--- a/functions/050_save_migration.sh
+++ b/functions/050_save_migration.sh
@@ -6,8 +6,8 @@ save_migration() {
   then
     # ROMs on SD card
     roms_folder="$default_sd/retrodeck/roms"
-    if [[ ! -L $rdhome && ! -L $rdhome/roms ]]; then # Add a roms folder symlink back to ~/retrodeck if missing, to fix things like PS2 autosaves until user migrates whole ~retrodeck directory
-      ln -s $roms_folder $rdhome/roms
+    if [[ ! -L "$rdhome" && ! -L "$rdhome/roms" ]]; then # Add a roms folder symlink back to ~/retrodeck if missing, to fix things like PS2 autosaves until user migrates whole ~retrodeck directory
+      ln -s $roms_folder "$rdhome/roms"
     fi
   else
     # ROMs on Internal
@@ -30,7 +30,7 @@ save_migration() {
   # Doing the dir prep as we don't know from which version we came
   dir_prep "$media_folder" "/var/config/ES-DE/downloaded_media"
   dir_prep "$themes_folder" "/var/config/ES-DE/themes"
-  create_dir $rdhome/logs #this was added later, maybe safe to remove in a few versions
+  create_dir "$rdhome/logs" #this was added later, maybe safe to remove in a few versions
 
   # Resetting es_settings, now we need it but in the future I should think a better solution, maybe with sed
   cp -fv /app/retrodeck/es_settings.xml /var/config/ES-DE/settings/es_settings.xml
@@ -39,13 +39,13 @@ save_migration() {
   # Perform save and state migration if needed
 
   # Moving PCSX2 Saves
-  mv -fv /var/config/PCSX2/sstates/* $rdhome/states/ps2/pcsx2
-  mv -fv /var/config/PCSX2/memcards/* $rdhome/saves/ps2/memcards
+  mv -fv /var/config/PCSX2/sstates/* "$rdhome/states/ps2/pcsx2"
+  mv -fv /var/config/PCSX2/memcards/* "$rdhome/saves/ps2/memcards"
 
   # Moving Citra saves from legacy location to 0.5.0b structure
 
-  mv -fv $rdhome/saves/Citra/* $rdhome/saves/n3ds/citra
-  rmdir $rdhome/saves/Citra # Old folder cleanup
+  mv -fv "$rdhome/saves/Citra/"* "$rdhome/saves/n3ds/citra"
+  rmdir "$rdhome/saves/Citra" # Old folder cleanup
 
   versionwheresaveschanged="0.4.5b" # Hardcoded break point between unsorted and sorted saves
 
@@ -71,9 +71,9 @@ save_migration() {
     current_dest_folder=
     gamestoskip=
 
-    tar -C $rdhome -czf $save_backup_file saves # Backup save directory for safety
+    tar -C "$rdhome" -czf $save_backup_file saves # Backup save directory for safety
     log i "Saves backed up to" $save_backup_file $migration_logfile
-    tar -C $rdhome -czf $state_backup_file states # Backup state directory for safety
+    tar -C "$rdhome" -czf $state_backup_file states # Backup state directory for safety
     log i "States backed up to" $state_backup_file $migration_logfile
 
     (

From 2821ce41066fb4d4a44df4410ff56e82fab19a87 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sun, 21 Jul 2024 21:01:47 +0900
Subject: [PATCH 2/2] THEME: applied new RetroDECK Theme

---
 net.retrodeck.retrodeck.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index f1993e16..d8d976b3 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -423,15 +423,15 @@ modules:
 
   # ES-DE Themes - START
 
-  - name: art-book-next-es-de
+  - name: RetroDECK Theme
     buildsystem: simple
     build-commands:
-      - mkdir -p ${FLATPAK_DEST}/share/es-de/themes/art-book-next-es-de/
-      - mv -f * ${FLATPAK_DEST}/share/es-de/themes/art-book-next-es-de/
+      - mkdir -p ${FLATPAK_DEST}/share/es-de/themes/retrodeck/
+      - mv -f * ${FLATPAK_DEST}/share/es-de/themes/retrodeck/
     sources:
       - type: git
-        url:  https://github.com/anthonycaccese/art-book-next-es-de.git
-        commit: 4fe896af7447404f6ea083335cd661c91b0f7860
+        url:  https://github.com/RetroDECK/RetroDECK-theme
+        commit: 975c41cac99d150b6ae86a1dfd19988058c69aad
 
   # ES-DE Themes - END
 
@@ -1315,4 +1315,4 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: THISBRANCH
+        branch: THISBRANCH
\ No newline at end of file