From 31a9c70b0344b4cd68252d260cdb846bfe2ea914 Mon Sep 17 00:00:00 2001
From: XargonWan <6771419+XargonWan@users.noreply.github.com>
Date: Tue, 11 Oct 2022 11:21:38 +0200
Subject: [PATCH 1/2] Removed unused symlinks for PCSX2-QT

---
 retrodeck.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/retrodeck.sh b/retrodeck.sh
index 4f08889c..d2634c81 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -114,15 +114,16 @@ standalones_init() {
     echo "----------------------"
     echo "Initializing PCSX2"
     echo "----------------------"
-    mkdir -pv /var/config/PCSX2/inis/
+    mkdir -pv "/var/config/PCSX2/inis"
     mkdir -pv "$rdhome/saves/ps2/pcsx2/memcards"
+    mkdir -pv "$rdhome/states/ps2/pcsx2"
     cp -fvr $emuconfigs/PCSX2/* /var/config/PCSX2/inis/
     sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2_ui.ini
     sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2.ini
-    dir_prep "$rdhome/states/ps2/pcsx2" "/var/config/PCSX2/sstates"
-    dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps"
-    dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs"
-    dir_prep "$rdhome/bios" "$rdhome/bios/pcsx2"
+    #dir_prep "$rdhome/states/ps2/pcsx2" "/var/config/PCSX2/sstates"
+    #dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps"
+    #dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs"
+    #dir_prep "$rdhome/bios" "$rdhome/bios/pcsx2"
 
     # MelonDS
     echo "----------------------"

From 07fb6e215c05f770f59b8932985335704b16f46e Mon Sep 17 00:00:00 2001
From: XargonWan <6771419+XargonWan@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:46:09 +0200
Subject: [PATCH 2/2] Moving PCSX2 saves in the new location

---
 retrodeck.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/retrodeck.sh b/retrodeck.sh
index d2634c81..7299aae0 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -288,6 +288,10 @@ post_update() {
     # 0.4 -> 0.5
     # 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
+
     versionwheresaveschanged="0.4.5b" # Hardcoded break point between unsorted and sorted saves
 
     if [[ $(sed -e "s/\.//g" <<< $hard_version) > $(sed -e "s/\.//g" <<< $versionwheresaveschanged) ]] && [[ ! $(sed -e "s/\.//g" <<< $hard_version) == $(sed -e "s/\.//g" <<< $version) ]]; then # Check if user is upgrading from the version where save organization was changed. Try not to reuse this, it things 0.4.5b is newer than 0.4.5