From b48900b3f4de5892764dd61f9476e39c94287545 Mon Sep 17 00:00:00 2001
From: Robles Rodolphe <rodolphe.robles@sfr.fr>
Date: Mon, 1 Nov 2021 19:14:10 +0100
Subject: [PATCH] simplify conditions if pre-upgrade needed

---
 scripts/upgrade | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index c2b9ad2..fdf8932 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -25,13 +25,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 # CHECK VERSION
 #=================================================
 
-if ynh_compare_current_package_version --comparison lt --version 0.9.8.1~ynh1; then
-  upgrade_type="0.9.8"
-elif ynh_compare_current_package_version --comparison le --version 1.0.7~ynh2; then
-  upgrade_type="1.1.0"
-else
-  upgrade_type=$(ynh_check_app_version_changed)
-fi
+upgrade_type=$(ynh_check_app_version_changed)
 
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
@@ -85,7 +79,7 @@ fi
 # UPGRADE TO 0.9.8 if necessary
 #=================================================
 
-if [ "$upgrade_type" == "0.9.8" ]
+if ynh_compare_current_package_version --comparison lt --version 0.9.8.1~ynh1
 then
   ynh_script_progression --message="Upgrading upgrade to 0.9.8" --weight=5
 
@@ -101,13 +95,11 @@ then
   backup_bdd=/tmp/association.sqlite
   backup_squelettes=/tmp/squelettes
 
-  if  [ -d "$backup_squelettes" ]
-  then
+  if  [ -d "$backup_squelettes" ]; then
     cp -ar $backup_squelettes $final_path/www/squelettes
-  fi
+   fi
 
-  if [ -e "$backup_bdd" ]
-  then
+  if [ -e "$backup_bdd" ]; then
     cp -a $backup_bdd $final_path/association.sqlite
   fi
 
@@ -135,11 +127,11 @@ fi
 # UPGRADE TO 1.1.0 if necessary
 #=================================================
 
-if [ "$upgrade_type" == "1.1.0" ]
+if ynh_compare_current_package_version --comparison lt --version 1.1.0~ynh1
 then
   ynh_script_progression --message="Upgrading upgrade to 1.1.0" --weight=5
-
-  # Download, check integrity, uncompress and patch the source from 1.1.0.src
+  
+  # Download, check integrity, uncompress and patch the source from 0.9.8.src
   ynh_setup_source --keep="config.local.php" --dest_dir="$final_path" --source_id="1.1.0"
   # Set permissions on app files
   ynh_system_user_create --username=$app
@@ -151,13 +143,11 @@ then
   backup_bdd=/tmp/association.sqlite
   backup_squelettes=/tmp/squelettes
 
-  if  [ -d "$backup_squelettes" ]
-  then
+  if  [ -d "$backup_squelettes" ]; then
     cp -ar $backup_squelettes $final_path/www/squelettes
   fi
 
-  if [ -e "$backup_bdd" ]
-  then
+  if [ -e "$backup_bdd" ]; then
     cp -a $backup_bdd $final_path/association.sqlite
   fi
 
@@ -225,14 +215,12 @@ ynh_script_progression --message="restore data..." --weight=10
 backup_bdd=/tmp/association.sqlite
 backup_squelettes=/tmp/squelettes
 
-if  [ -d "$backup_squelettes" ]
-then
+if  [ -d "$backup_squelettes" ]; then
   cp -ar $backup_squelettes $final_path/www/squelettes
   ynh_secure_remove  $backup_squelettes
 fi
 
-if [ -e "$backup_bdd" ]
-then
+if [ -e "$backup_bdd" ]; then
   cp -a $backup_bdd $final_path/association.sqlite
   ynh_secure_remove $backup_bdd
 fi
@@ -270,4 +258,4 @@ chmod 440 "$final_path/config.local.php"
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Upgrade of Garradin completed" --last
\ No newline at end of file
+ynh_script_progression --message="Upgrade of Garradin completed" --last