From 7138dc6bcb5baaaee1c5f53f3d997bdc1e561418 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 28 Dec 2023 16:52:23 +0100
Subject: [PATCH] directive added when upgrading from 1.2.8 to correct moving
 db files

---
 scripts/upgrade | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index b873a92..3b57160 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -98,9 +98,6 @@ if [ ! -d "$data_dir/data" ]; then
 	chown $app:www-data "$data_dir/data"
 fi
 
-if [ ! -f "$install_dir/data/association.sqlite" ]; then
-	mv "$install_dir/data/association.*" "$data_dir/data/"
-fi
 
 if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   ynh_script_progression --message="Adding a configuration file..." --weight=5
@@ -110,6 +107,10 @@ if [ ! -f "$data_dir/data/config.local.user.php" ]; then
   chown $app:$app "$data_dir/data/config.local.user.php"
 fi
 
+if [ ! -f "$install_dir/data/association.sqlite" ]; then
+	mv "$install_dir/data/association.*" "$data_dir/data/"
+	ynh_secure_remove "$install_dir/data/association.*"
+fi
 
 #=================================================
 # END OF SCRIPT