From ebb25d06d2a34cbe5f2e3fe0cec5daba7a5fd5a0 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Tue, 10 Jan 2023 11:41:09 -0500
Subject: [PATCH] Fix post-update ver check and add more move safety

---
 post_update.sh        | 2 +-
 tools/configurator.sh | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/post_update.sh b/post_update.sh
index d7d771bd..ecd6a2c2 100644
--- a/post_update.sh
+++ b/post_update.sh
@@ -7,7 +7,7 @@ post_update() {
 
   local prev_version=$(sed -e 's/[\.a-z]//g' <<< $version)
 
-  if [[ $prev_version -le "054" ]]; then # If updating from prior to save sorting change
+  if [[ $prev_version -le "050" ]]; then # If updating from prior to save sorting change at 0.5.0b
 
     # Finding existing ROMs folder
     if [ -d "$default_sd/retrodeck" ]
diff --git a/tools/configurator.sh b/tools/configurator.sh
index beed5170..b055c3a5 100644
--- a/tools/configurator.sh
+++ b/tools/configurator.sh
@@ -465,9 +465,7 @@ configurator_move_dialog() {
           if [[ -L $rdhome/roms ]]; then # Check for ROMs symlink user may have created
             unlink $rdhome/roms
           fi
-          if [[ -L $rdhome && ! $rdhome == "$HOME/retrodeck" ]]; then # Clean up extraneus symlinks from previous moves
-            unlink $rdhome
-          fi
+
           unlink $HOME/retrodeck # Remove symlink for $rdhome if the previous location was not internal
 
           (
@@ -482,6 +480,10 @@ configurator_move_dialog() {
             ln -svf "$custom_dest/retrodeck" "$HOME"
           fi
 
+          if [[ -L $rdhome && ! $rdhome == "$HOME/retrodeck" ]]; then # Clean up extraneus symlinks from previous moves
+            unlink $rdhome
+          fi
+
           rdhome="$custom_dest/retrodeck"
           roms_folder="$rdhome/roms"
           saves_folder="$rdhome/saves"