From d5fd18a2c3f6abc3b63968713052b6073c4c3a12 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Fri, 7 Oct 2022 18:50:36 -0400
Subject: [PATCH 1/2] Fix for missing ROMs folder

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

diff --git a/retrodeck.sh b/retrodeck.sh
index 6c437926..f66158a0 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -251,6 +251,17 @@ post_update() {
     # post update script
     echo "Executing post-update script"
 
+    # Finding existing ROMs folder
+    if [ -d "$default_sd/retrodeck" ]
+    then
+      # ROMs on SD card
+      roms_folder="$default_sd/retrodeck/roms"
+    else
+      # ROMs on Internal
+      roms_folder="$HOME/retrodeck/roms"
+    fi
+    echo "ROMs folder found at $roms_folder"
+
     # Unhiding downloaded media from the previous versions
     if [ -d "$rdhome/.downloaded_media" ]
     then

From 0c7ff2a5340980b92f8d6e2e3b246d99d603df36 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Sat, 8 Oct 2022 09:55:12 -0400
Subject: [PATCH 2/2] Even more dialog changes

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

diff --git a/retrodeck.sh b/retrodeck.sh
index f66158a0..4f08889c 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -294,12 +294,10 @@ post_update() {
         save_backup_file=$rdhome/savebackup_"$(date +"%Y_%m_%d_%I_%M_%p").zip"
         state_backup_file=$rdhome/statesbackup_"$(date +"%Y_%m_%d_%I_%M_%p").zip"
 
-        # NOTE: This Zenity command may need to be one line, it broke when I pasted it into a sandbox file
-
         zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
             --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
             --title "RetroDECK" \
-            --text="You are updating to a version of RetroDECK where save and state file sorting has changed!\n\nYour existing saves will be backed up to $save_backup_file\n\nYour existing states will be backed up to $state_backup_file\n\nIf a save or state cannot be sorted automatically it will remain in its original directory so you can sort it manually.\n\nIf you encounter any issues, a log of the sorting process is stored at $migration_logfile\n\nPLEASE BE PATIENT! This process can take several minutes if you have a large ROM library."
+            --text="You are updating to a version of RetroDECK where save file locations have changed!\n\nYour existing files will be backed up for safety and then sorted automatically.\n\nIf a file cannot be sorted automatically it will remain where it is for manual sorting.\n\nPLEASE BE PATIENT! This process can take several minutes if you have a large ROM library."
 
         allgames=($(find "$roms_folder" -maxdepth 2 -mindepth 2 ! -name "systeminfo.txt" ! -name "systems.txt" ! -name "gc" ! -name "n3ds" ! -name "nds" ! -name "wii" ! -name "xbox" ! -name "*^*" | sed -e "s/ /\^/g")) # Build an array of all games and multi-disc-game-containing folders, adding whitespace placeholder
 
@@ -394,7 +392,19 @@ post_update() {
         --no-cancel \
         --auto-close
 
-        # NOTE: This Zenity command may need to be one line, it broke when I pasted it into a sandbox file
+        if [[ $(cat $migration_logfile | grep "ERROR" | wc -l) -eq 0 ]]; then
+          zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
+          --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+          --title "RetroDECK" \
+          --text="The migration process has sorted all of your files automatically.\n\nEverything should be working normally, if you experience any issues please check the RetroDECK wiki or contact us directly on the Discord."
+
+        else
+          cat $migration_logfile | grep "ERROR" > "$rdhome/manual_sort_needed.log"
+          zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
+          --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+          --title "RetroDECK" \
+          --text="The migration process was unable to sort $(cat $migration_logfile | grep "ERROR" | wc -l) files automatically.\n\nThese files will need to be moved manually to their new locations, find more detail on the RetroDECK wiki.\n\nA log of the files that need manual sorting can be found at $rdhome/manual_sort_needed.log"
+        fi
 
     else
       echo "Version" $version "is after the save and state organization was changed, no need to sort again"