From fb738b89289345a343a4b5e077b9edb48a543095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 28 Oct 2023 15:44:44 +0200
Subject: [PATCH] cleaning

---
 scripts/install | 3 ---
 scripts/restore | 3 ---
 scripts/upgrade | 8 ++++----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/scripts/install b/scripts/install
index 3abf75e..984ab85 100644
--- a/scripts/install
+++ b/scripts/install
@@ -45,8 +45,6 @@ ynh_add_fpm_config
 #=================================================
 ynh_script_progression --message="Configuring aeneria..." --weight=1
 
-aeneria_conf="$install_dir/.env"
-
 ynh_add_config --template="../conf/.env" --destination="$install_dir/.env"
 
 # Restrict rights to aeneria user only
@@ -60,7 +58,6 @@ ynh_script_progression --message="Installing aeneria..." --weight=1
 # Install aeneria
 pushd $install_dir
 	ynh_exec_as $app php$phpversion bin/console aeneria:install "$app" -n
-
 	# Create admin user
 	mail=$(ynh_user_get_info --username="$admin" --key='mail')
 	ynh_exec_as $app php$phpversion bin/console aeneria:user:add "$mail" "$(ynh_string_random)" -n
diff --git a/scripts/restore b/scripts/restore
index 8fd132d..a3a07d4 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -37,9 +37,6 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-# Recreate a dedicated php-fpm config
-ynh_add_fpm_config
-
 ynh_restore_file --origin_path="/etc/cron.d/$app"
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 15bcedb..03fac98 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,7 +23,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 ynh_script_progression --message="Ensuring downward compatibility..."
 
 # If minutes or hour do not exist, create them
-if [ -z "${minutes:-}" ] || [ -z "$hour" ]; then
+if [ -z "${minutes:-}" ] || [ -z "${hour:-}" ]; then
 	# Generate random running schedule, and save $hour and $minutes as app parameters
 	generate_random_minutes_hour
 fi
@@ -68,7 +68,7 @@ ynh_add_nginx_config
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config
 
-ynh_add_config --template="../conf/aeneria.cron" --destination="/etc/cron.d/$app"
+ynh_add_config --template="aeneria.cron" --destination="/etc/cron.d/$app"
 chown root: "/etc/cron.d/$app"
 chmod 644 "/etc/cron.d/$app"
 
@@ -77,7 +77,7 @@ chmod 644 "/etc/cron.d/$app"
 #=================================================
 # CONFIGURE AENERIA
 #=================================================
-ynh_script_progression --message="Configuring aeneria..." --weight=1
+ynh_script_progression --message="Configuring $app..." --weight=1
 
 ynh_add_config --template=".env" --destination="$install_dir/.env"
 
@@ -87,7 +87,7 @@ chmod 600 "$install_dir/.env"
 #=================================================
 # UPGRADE AENERIA
 #=================================================
-ynh_script_progression --message="Upgrading aeneria..." --weight=1
+ynh_script_progression --message="Upgrading $app..." --weight=1
 
 # Install dependencies and aeneria
 pushd $install_dir