From ac115d177102f330cefb2120df2524540f1b8ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 21 Dec 2023 14:41:46 +0100
Subject: [PATCH] cleaning

---
 scripts/install |  3 ---
 scripts/remove  |  2 --
 scripts/upgrade | 10 +---------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/scripts/install b/scripts/install
index 0958a64..711ba42 100644
--- a/scripts/install
+++ b/scripts/install
@@ -30,7 +30,6 @@ ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=1
 
-# Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
 
 chmod -R o-rwx "$install_dir"
@@ -41,10 +40,8 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Configuring NGINX web server..." --weight=10
 
-# Create a dedicated NGINX config
 ynh_add_nginx_config
 
-# Create a dedicated PHP-FPM config
 ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 61db822..ac762c0 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -14,10 +14,8 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
 
-# Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-# Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 7281fd3..b15c0a5 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -46,7 +46,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..." --weight=5
 
-	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$install_dir" --keep="data"
     ynh_secure_remove --file="$install_dir/data/viewcache/*"
 fi
@@ -59,17 +58,10 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
 
-# Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
-
 # Create a dedicated php-fpm config
-ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
 #=================================================
 # MODIFY A CONFIG FILE