From c8d6fbdbe8e901ff2cd3661d291fb911ddca40bf Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Sat, 16 Sep 2023 09:52:34 +0200
Subject: [PATCH] cleaning code upgrade

---
 scripts/upgrade | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 2c2a21e..614bab4 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -30,11 +30,11 @@ if [[ -z "${secret_key:-}" ]]; then
 fi
 
 #=================================================
-# BACKUP SQLITE DATABASE
+# BACKUP SQLITE DATABASE AND DATAS
 #=================================================
 ynh_script_progression --message="Backup of the DB in temporary file...." --weight=5
 
-# copy data directory bacckup
+# copy data directory backup
 cp -a $install_dir/data /tmp/data
 
 #=================================================
@@ -84,9 +84,19 @@ fi
 ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php"
 ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php"
 
+#=================================================
+# RESTORE BACKUP SQLITE DATABASE AND DATAS
+#=================================================
+ynh_script_progression --message="Restore datas..." --weight=5
+
 # Sync data directory backup
 rsync -R /tmp/data/ $install_dir/data/
 
+#=================================================
+# FIX PERMISSIONS
+#=================================================
+ynh_script_progression --message="Fix permissions..." --weight=2
+
 # Permissions on files and directories
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
@@ -108,10 +118,11 @@ sleep 5
 ynh_local_curl "/index.php"
 sleep 5
 
-#=================================================
-# END OF SCRIPT
-#=================================================
 # remove directory duplicated
 ynh_secure_remove --file="/tmp/data"
 
+#=================================================
+# END OF SCRIPT
+#=================================================
+
 ynh_script_progression --message="Upgrade of $app completed" --last