From 3c03204791e250de98f0bf7029cae2bd8c665a3e Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Mon, 6 Feb 2023 01:58:53 +0100
Subject: [PATCH] Fix

---
 scripts/upgrade | 44 ++++++++++++++++++--------------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 0ac7996..d58aa56 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -21,14 +21,14 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 language=$(ynh_app_setting_get --app=$app --key=language)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-#db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-#db_user=$(ynh_app_setting_get --app=$app --key=db_user)
-#db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
+db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+db_user=$(ynh_app_setting_get --app=$app --key=db_user)
+db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 port=$(ynh_app_setting_get --app=$app --key=port)
 datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 admin_mail=$(ynh_user_get_info --username=$admin --key=username)
-#key=$(ynh_string_random --length=32)
+key=$(ynh_string_random --length=32)
 
 #=================================================
 # CHECK VERSION
@@ -85,41 +85,21 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
-#=================================================
-# CREATE DATA DIRECTORY
-#=================================================
-ynh_script_progression --message="Creating a data directory..." --weight=1
-
-datadir=/home/yunohost.app/$app
-ynh_app_setting_set --app=$app --key=datadir --value=$datadir
-
-mkdir -p $datadir
-mkdir -p $datadir/images
-
-chmod 750 "$datadir"
-chmod -R o-rwx "$datadir"
-chown -R $app:www-data "$datadir"
 
 #=================================================
 # CONFIGURE THEN INSTALL SCRIPT AND DEPENDENCIES
 #=================================================
 ynh_script_progression --message="Installing service script..." --weight=1
 
-#ynh_add_config --template="../conf/.env.production" --destination="$final_path/.env"
-#chmod 600 $final_path/.env
-#chown $app:www-data "$final_path/.env"
-
-set -a; source "$final_path/.env"; set +a
-
 ynh_secure_remove --file="$final_path/venv"
 mkdir "$final_path/venv"
 python3 -m venv "$final_path/venv"
 $final_path/venv/bin/pip3 install -r "$final_path/requirements.txt"
 
 #=================================================
-# INITIALIZE DATABASE
+# Update DATABASE
 #=================================================
-ynh_script_progression --message="Initializing database..." --weight=1
+ynh_script_progression --message="Upgrading database..." --weight=1
 
 $final_path/venv/bin/python3 "$final_path/manage.py" migrate
 $final_path/venv/bin/python3 "$final_path/manage.py" collectstatic --no-input
@@ -146,6 +126,18 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=1
 
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
+
+#=================================================
+# UPDATE A CONFIG FILE
+#=================================================
+ynh_script_progression --message="Updating a config file..." --weight=1
+
+ynh_add_config --template="../conf/.env.production" --destination="$final_path/.env"
+chmod 600 $final_path/.env
+chown $app:www-data "$final_path/.env"
+
+set -a; source "$final_path/.env"; set +a
+
 #=================================================
 # SETUP SYSTEMD
 #=================================================