Merge pull request #931 from JaKooLit/development

Development to main:   Fix upgrade bug 

1 files changed, 10 insertions, 4 deletions

diff --git a/copy.sh b/copy.sh
index b061f4ac..90dc1b83 100755
--- a/copy.sh
+++ b/copy.sh
@@ -167,6 +167,7 @@ while [[ $# -gt 0 ]]; do
   esac
   shift
 done
+INSTALLED_VERSION=$(get_installed_dotfiles_version)
 EXPRESS_SUPPORTED=0
 if express_supported; then
   EXPRESS_SUPPORTED=1
@@ -409,7 +410,12 @@ if command -v ags >/dev/null 2>&1; then
   fi
 fi
 
-printf "\n%.0s" {1..1}
+printf "\\n%.0s" {1..1}
+
+# Capture installed dotfiles version at the start of the workflow so we
+# can apply cleanup rules based on the pre-upgrade state, even if a newer
+# version marker is copied in later.
+INSTALLED_VERSION_AT_START="$(get_installed_dotfiles_version || true)"
 
 # quickshell (ags alternative)
 # Check if quickshell is installed
@@ -477,10 +483,10 @@ fi
 printf "\n%.0s" {1..1}
 
 restore_hypr_assets "$LOG" "$EXPRESS_MODE"
-printf "\n%.0s" {1..1}
+printf "\\n%.0s" {1..1}
 
-restore_user_configs "$LOG" "$EXPRESS_MODE"
-printf "\n%.0s" {1..1}
+restore_user_configs "$LOG" "$EXPRESS_MODE" "$INSTALLED_VERSION_AT_START"
+printf "\\n%.0s" {1..1}
 
 restore_user_scripts "$LOG" "$EXPRESS_MODE"
 printf "\n%.0s" {1..1}