From 217eb7e8187fe433644e82380666d2c7fd0c8879 Mon Sep 17 00:00:00 2001
From: Gofannon <gofannon+github@riseup.net>
Date: Sun, 21 Aug 2022 01:31:11 +0200
Subject: [PATCH] Remove unused variable + pretty indent

---
 scripts/install | 1 -
 scripts/restore | 2 +-
 scripts/upgrade | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/install b/scripts/install
index 863b430..e39993f 100755
--- a/scripts/install
+++ b/scripts/install
@@ -88,7 +88,6 @@ chown -R $app:www-data "$final_path"
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 
 # Create a dedicated PHP-FPM config
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 fpm_usage=low
 fpm_footprint=low
 ynh_add_fpm_config --usage="$fpm_usage" --footprint="$fpm_footprint"
diff --git a/scripts/restore b/scripts/restore
index f285815..5469cad 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -30,8 +30,8 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
 fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
 
diff --git a/scripts/upgrade b/scripts/upgrade
index a9430de..790c8e0 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -296,9 +296,9 @@ fi
     # if "file" exists and is executable
     # Stolen from https://github.com/YunoHost-Apps/grav_ynh/blob/testing/scripts/upgrade#L189
     if [ -x "$final_path/bin/plugin.php" ]; then
-    pushd "$final_path"
-        ynh_exec_warn_less ynh_exec_as $app php${YNH_PHP_VERSION} bin/plugin.php --no-colors extension upgrade || ynh_print_warn --message="Automatic plugin upgrade has failed, you can upgrade them from your DokuWiki admin panel."
-    popd
+        pushd "$final_path"
+            ynh_exec_warn_less ynh_exec_as $app php${YNH_PHP_VERSION} bin/plugin.php --no-colors extension upgrade || ynh_print_warn --message="Automatic plugin upgrade has failed, you can upgrade them from your DokuWiki admin panel."
+        popd
     else
         ynh_print_warn --message="Automatic plugin cannot be done, you have to upgrade them from your DokuWiki admin panel."
     fi