Fix scripts.

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]

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

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