From af87923bf5215cc631c44988e9f4c17537e727bb Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 13 Mar 2022 15:55:16 +0100
Subject: [PATCH] Fix

---
 conf/noalyss.conf |  2 +-
 scripts/install   |  2 +-
 scripts/remove    | 16 ++++++++--------
 scripts/restore   |  6 ------
 scripts/upgrade   | 15 +--------------
 5 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/conf/noalyss.conf b/conf/noalyss.conf
index dca73b7..46fee27 100644
--- a/conf/noalyss.conf
+++ b/conf/noalyss.conf
@@ -1,5 +1,5 @@
 <?php 
-date_default_timezone_set ('Europe/Brussels');
+date_default_timezone_set ('__TIMEZONE__');
 $_ENV['TMP']='/tmp';
 define("PG_PATH","/usr/bin");
 define("PG_RESTORE","/usr/bin/pg_restore ");
diff --git a/scripts/install b/scripts/install
index e87693d..b94f3cc 100755
--- a/scripts/install
+++ b/scripts/install
@@ -67,7 +67,7 @@ db_name=$(ynh_sanitize_dbid --db_name=$app)
 db_user=$db_name
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_psql_test_if_first_run
-ynh_psql_setup_db --db_user=$db_name --db_name=$db_name
+ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
 
 #=================================================
 # CREATE DEDICATED USER
diff --git a/scripts/remove b/scripts/remove
index e534dc8..6e562aa 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -29,14 +29,6 @@ ynh_script_progression --message="Removing the PostgreSQL database"
 # Remove a database if it exists, along with the associated user
 ynh_psql_remove_db --db_user=$db_user --db_name=$db_name
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies"
-
-# Remove metapackage and its dependencies
-ynh_remove_app_dependencies
-
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================
@@ -61,6 +53,14 @@ ynh_script_progression --message="Removing PHP-FPM configuration"
 # Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
 
+#=================================================
+# REMOVE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Removing dependencies"
+
+# Remove metapackage and its dependencies
+ynh_remove_app_dependencies
+
 #=================================================
 # REMOVE LOGROTATE CONFIGURATION
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index ff34c7d..58361ab 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -90,12 +90,6 @@ ynh_psql_test_if_first_run
 ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
 ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
 
-#=================================================
-# ADVERTISE SERVICE IN ADMIN PANEL
-#=================================================
-
-#yunohost service add $app --log "/var/log/$app/$app.log"
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 9068031..1a16c0f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -84,21 +84,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..." --weight=5
 
-	# Create a temporary directory
-	tmpdir="$(mktemp -d)"
-
-	cp -a "$final_path/include/config.inc.php" "$tmpdir/config.inc.php"
-
-	# Remove the app directory securely
-	ynh_secure_remove --file=$final_path
-
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir=$final_path
-
-	cp -a "$tmpdir/config.inc.php" "$final_path/include/config.inc.php"
-
-	# Remove the tmp directory securely
-	ynh_secure_remove --file="$tmpdir"
+	ynh_setup_source --dest_dir=$final_path --keep="$final_path/include/config.inc.php"
 fi
 
 chmod 750 "$final_path"