From 07d976661e6954cf2a2f6443188b4e16e8dcf162 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 1 Jun 2022 23:17:58 +0200
Subject: [PATCH] Better ynh_add_swap

---
 check_process   | 2 +-
 scripts/install | 2 +-
 scripts/remove  | 2 +-
 scripts/restore | 2 +-
 scripts/upgrade | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/check_process b/check_process
index ba1d0d3..c66d406 100644
--- a/check_process
+++ b/check_process
@@ -16,7 +16,7 @@
 		setup_public=1
 		upgrade=1
 		# 12.0-6
-		upgrade=1	from_commit=2cfdbc229faa8700873e681a01f823c32475cca8
+		# upgrade=1	from_commit=2cfdbc229faa8700873e681a01f823c32475cca8
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
diff --git a/scripts/install b/scripts/install
index 750e793..e37aba6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -139,11 +139,11 @@ ynh_add_nginx_config
 #=================================================
 # ADD SWAP
 #=================================================
-ynh_script_progression --message="Adding swap..."
 
 if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
     :
 else
+    ynh_script_progression --message="Adding swap..."
     ynh_add_swap --size=$swap_needed
 fi
 
diff --git a/scripts/remove b/scripts/remove
index b67cd00..9eac726 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -91,11 +91,11 @@ ynh_secure_remove --file="/var/log/$app.log"
 #=================================================
 # REMOVE SWAP
 #=================================================
-ynh_script_progression --message="Removing swap..."
 
 if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
 	:
 else
+	ynh_script_progression --message="Removing swap..."
 	ynh_del_swap
 fi
 
diff --git a/scripts/restore b/scripts/restore
index a967402..2effee2 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -98,11 +98,11 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 # ADD SWAP
 #=================================================
-ynh_script_progression --message="Adding swap..."
 
 if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
     :
 else
+    ynh_script_progression --message="Adding swap..."
     ynh_add_swap --size=$swap_needed
 fi
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 8fe393d..bd9ae58 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -105,11 +105,11 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 # ADD SWAP
 #=================================================
-ynh_script_progression --message="Adding swap..."
 
 if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
     :
 else
+    ynh_script_progression --message="Adding swap..."
     ynh_add_swap --size=$swap_needed
 fi