From 2ce3dce0278c0452e616d75141e7a93fc57d00f4 Mon Sep 17 00:00:00 2001
From: Fabian Wilkens <wilkens.fabian+github@gmail.com>
Date: Tue, 9 Aug 2022 21:17:53 +0200
Subject: [PATCH] Fix: fix scripts and cleanup

---
 conf/env_files.env.sample |  4 ++--
 scripts/install           |  2 +-
 scripts/remove            |  4 ++--
 scripts/upgrade           | 31 ++++++++++++++++++-------------
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/conf/env_files.env.sample b/conf/env_files.env.sample
index 98ec8ee..3d64490 100644
--- a/conf/env_files.env.sample
+++ b/conf/env_files.env.sample
@@ -1,6 +1,6 @@
 __YNH_NODE_LOAD_PATH__
 
-LOG_LEVEL="debug"
+LOG_LEVEL="info"
 NODE_ENV="production"
 VERSION="production"
 
@@ -34,4 +34,4 @@ SQS_QUEUE_URL=
 SQS_AWS_REGION=
 
 # (Optional) File upload path (relative to root directory)
-FILE_UPLOAD_PATH=/home/yunohost.app/__APP__/uploads/
+FILE_UPLOAD_PATH=__DATADIR__/uploads/
diff --git a/scripts/install b/scripts/install
index 0bddbcd..68c9b82 100755
--- a/scripts/install
+++ b/scripts/install
@@ -304,7 +304,7 @@ ynh_systemd_action \
 #=================================================
 ynh_script_progression --message="Setup a cron..."
 
-ynh_add_config --template="../conf/cron.env" --destination="__finalpath__/$app.env"
+ynh_add_config --template="../conf/cron.env" --destination="$final_path/cron.env"
 ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
 
 chown root: "/etc/cron.d/$app"
diff --git a/scripts/remove b/scripts/remove
index a4e94e0..38c82de 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -121,8 +121,8 @@ ynh_secure_remove --file="$final_path"
 # Remove the data directory if --purge option is used
 if [ "${YNH_APP_PURGE:-0}" -eq 1 ]
 then
-	ynh_script_progression --message="Removing app data directory..." --weight=1
-	ynh_secure_remove --file="$datadir"
+    ynh_script_progression --message="Removing app data directory..." --weight=1
+    ynh_secure_remove --file="$datadir"
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 74da0eb..715d27e 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -44,10 +44,6 @@ pseudo_key_params_key=$(ynh_app_setting_get --app=$app --key=pseudo_key_params_k
 encryption_server_key=$(ynh_app_setting_get --app=$app --key=encryption_server_key)
 valet_token_secret=$(ynh_app_setting_get --app=$app --key=valet_token_secret)
 
-syncing_server_version_installed=$(ynh_app_setting_get --app=$app --key=syncing_server_version)
-auth_version_installed=$(ynh_app_setting_get --app=$app --key=auth_version)
-api_gateway_version_installed=$(ynh_app_setting_get --app=$app --key=api_gateway_version)
-
 disable_user_registration=$(ynh_app_setting_get --app=$app --key=DISABLE_USER_REGISTRATION)
 files_size=$(ynh_app_setting_get --app=$app --key=FILES_SIZE)
 
@@ -158,7 +154,7 @@ if [ -z "$port_files" ]; then
 fi
 # If port_syncing_server doesn't exist, create it
 if [ -z "$port_syncing_server" ]; then
-	port_syncing_server=$(ynh_find_port --port=$((port_files+1)))
+    port_syncing_server=$(ynh_find_port --port=$((port_files+1)))
     ynh_app_setting_set --app=$app --key=port_syncing_server --value=$port_syncing_server
 fi
 # If port_syncing_server_worker doesn't exist, create it
@@ -167,7 +163,6 @@ if [ -z "$port_syncing_server_worker" ]; then
     ynh_app_setting_set --app=$app --key=port_syncing_server_worker --value=$port_syncing_server_worker
 fi
 
-
 # If jwt_secret doesn't exist, create it
 if [ -z "$jwt_secret" ]; then
     jwt_secret=$(ynh_string_random --length=48 | base64)
@@ -199,7 +194,7 @@ if [ -z "$valet_token_secret" ]; then
     ynh_app_setting_set --app=$app --key=valet_token_secret --value=$valet_token_secret
 fi
 # If disable_user_registration doesn't exist, create it
-if [ -z "$diable_user_registration" ]; then
+if [ -z "$disable_user_registration" ]; then
     disable_user_registration=false
     ynh_app_setting_set --app=$app --key=DISABLE_USER_REGISTRATION --value=$disable_user_registration
 fi
@@ -209,15 +204,26 @@ if [ -z "$files_size" ]; then
     ynh_app_setting_set --app=$app --key=FILES_SIZE --value=$files_size
 fi
 
-
 # Remove old Settings, Services, Files, Dependencies
 # If final_path_www exist, delete it
+api_gateway_version_installed=$(ynh_app_setting_get --app=$app --key=api_gateway_version)
+auth_version_installed=$(ynh_app_setting_get --app=$app --key=auth_version)
+syncing_server_version_installed=$(ynh_app_setting_get --app=$app --key=syncing_server_version)
 final_path_www=$(ynh_app_setting_get --app=$app --key=final_path_www)
+final_path_extensions=$(ynh_app_setting_get --app=$app --key=final_path_extensions)
+if [ -n ${api_gateway_version_installed+x} ]; then
+    ynh_app_setting_delete --app=$app --key=api_gateway_version_installed
+fi
+if [ -n ${auth_version_installed+x} ]; then
+    ynh_app_setting_delete --app=$app --key=auth_version_installe
+fi
+if [ -n ${syncing_server_version_installed+x} ]; then
+    ynh_app_setting_delete --app=$app --key=syncing_server_version_installed
+fi
 if [ -n ${final_path_www+x} ]; then
     ynh_app_setting_delete --app=$app --key=final_path_www
 fi
 # If final_path_extensions exist, delete it
-final_path_extensions=$(ynh_app_setting_get --app=$app --key=final_path_extensions)
 if [ -n ${final_path_extensions+x} ]; then
     ynh_app_setting_delete --app=$app --key=final_path_extensions
 fi
@@ -225,7 +231,7 @@ fi
 # If permission help exists, delete it
 if ynh_permission_exists --permission="help"
 then
-	ynh_permission_delete --permission="help"
+    ynh_permission_delete --permission="help"
 fi
 
 # If old service exsits; remove it
@@ -240,7 +246,6 @@ then
     yunohost service remove "$app-syncing-server-js-worker"
 fi
 
-
 # Remove unneeded data
 if [ -e "/var/www/$app" ]; then
     ynh_secure_remove --file="/var/www/$app"
@@ -301,7 +306,7 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=1
 # Remove old nodejs version
 if [[ "$nodejs_version_installed" < "$NODEJS_VERSION" && -n "$nodejs_version_installed" ]]
 then
-	ynh_remove_nodejs
+    ynh_remove_nodejs
 fi
 
 ynh_install_app_dependencies $pkg_dependencies
@@ -445,7 +450,7 @@ ynh_systemd_action \
 #=================================================
 ynh_script_progression --message="Setup a cron..."
 
-ynh_add_config --template="../conf/cron.env" --destination="__finalpath__/$app.env"
+ynh_add_config --template="../conf/cron.env" --destination="$final_path/cron.env"
 ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
 
 chown root: "/etc/cron.d/$app"