From f7713ee2304fba5f392a9de51d7f1568b7f4e474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 9 Oct 2023 21:34:58 +0200
Subject: [PATCH] Update upgrade

---
 scripts/upgrade | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index eb7444b..73c534f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -31,7 +31,10 @@ fi
 
 if [ -d "$install_dir/data" ]; then
     ynh_print_warn "Migrating data directory to $data_dir..."
-    mv "$install_dir/data" "$data_dir"
+
+    # remove old configuration files
+	ynh_secure_remove --file="$install_dir/data/config.local.user.php"
+	mv "$install_dir/data" "$data_dir"
 fi
 
 #=================================================
@@ -45,6 +48,8 @@ then
 	ynh_setup_source --dest_dir="$install_dir" #--keep="config.local.php"
 fi
 
+ynh_secure_remove --file="$install_dir/config.local.yunohost.php"
+
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
@@ -70,10 +75,6 @@ chmod 644 "/etc/cron.d/$app"
 #=================================================
 ynh_script_progression --message="Updating a configuration file..." --weight=5
 
-# remove old configuration files
-ynh_secure_remove --file="$install_dir/config.local.user.php"
-ynh_secure_remove --file="$install_dir/config.local.yunohost.php"
-
 # Install configuration files
 ynh_add_config --template="../conf/config.local.php" --destination="$install_dir/config.local.php"