From 31ec38eaf5f0793e6ce9bc07c3ab01d21c537360 Mon Sep 17 00:00:00 2001
From: orhtej2 <2871798+orhtej2@users.noreply.github.com>
Date: Thu, 2 Nov 2023 17:43:48 +0100
Subject: [PATCH] Fix scripts.

---
 manifest.toml   | 1 -
 scripts/restore | 2 +-
 scripts/upgrade | 8 +++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 99cf7c2..007434b 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -45,7 +45,6 @@ ram.runtime = "50M"
         url = "https://files.phpmyadmin.net/phpMyAdmin/5.1.3/phpMyAdmin-5.1.3-all-languages.tar.gz"
         sha256 = "7a85454d82d88cc1a6beb09114a67fa40230c4eff2ae1778b434fa74e80dc6d7"
 
-
     [resources.system_user]
 
     [resources.install_dir]
diff --git a/scripts/restore b/scripts/restore
index beb23a4..74a4654 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -54,7 +54,7 @@ chown $app: $install_dir/tmp
 ynh_script_progression --message="Reconfiguring PHP-FPM.." --weight=6
 
 # Restore the file first, so it can have a backup if different
-ynh_restore_file --origin_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf"
+ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 # Recreate a dedicated php-fpm config
 ynh_add_fpm_config
diff --git a/scripts/upgrade b/scripts/upgrade
index 6f38759..67fce25 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -21,9 +21,11 @@ upgrade_type=$(ynh_check_app_version_changed)
 ynh_script_progression --message="Ensuring downward compatibility..."
 
 # In older version, the admin setting was admin_user
-if [ -z "$admin" ]; then
-	admin=$(ynh_app_setting_get --app=$app --key=admin_user)
-	ynh_app_setting_set --app=$app --key=admin --value=$admin
+if [ -n "$admin" ]; then
+	ynh_app_setting_delete --app=$app --key=admin
+fi
+
+if [ -n "$admin_user" ]; then
 	ynh_app_setting_delete --app=$app --key=admin_user
 fi