From 54dd18071306a42e51697b65f836b92b0ec277f3 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Mon, 1 Nov 2021 16:35:07 +0100 Subject: [PATCH] back to previous code for upgrade --- scripts/upgrade | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index a04d80c..c2b9ad2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,13 +25,13 @@ 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 +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 +fi #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP @@ -85,7 +85,7 @@ fi # UPGRADE TO 0.9.8 if necessary #================================================= -if ynh_compare_current_package_version --comparison lt --version 0.9.8.1 +if [ "$upgrade_type" == "0.9.8" ] then ynh_script_progression --message="Upgrading upgrade to 0.9.8" --weight=5 @@ -135,7 +135,7 @@ fi # UPGRADE TO 1.1.0 if necessary #================================================= -if ynh_compare_current_package_version --comparison lt --version 1.1.0 +if [ "$upgrade_type" == "1.1.0" ] then ynh_script_progression --message="Upgrading upgrade to 1.1.0" --weight=5