From d141ad288241b5e1699fc44a9e067a8d9815274e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 11 Jun 2020 20:59:22 +0200 Subject: [PATCH] Fix upgrade ./upgrade: line 189: [: : integer expression expected --- check_process | 9 +++++++++ scripts/upgrade | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index 65cd5f9..4f8e79e 100644 --- a/check_process +++ b/check_process @@ -18,6 +18,10 @@ setup_private=1 setup_public=1 upgrade=1 + # 2.14.0 + upgrade=1 from_commit=36d8f49e08958c19f99eda858f83a64e98be7844 + # 2.17.0~ynh1 + upgrade=1 from_commit=4b497cf6445fc515070265721f40ceb816864bf1 backup_restore=1 multi_instance=1 # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. @@ -30,3 +34,8 @@ ;;; Options Email=anmol@datamol.org Notification=change +;;; Upgrade options + ; commit=36d8f49e08958c19f99eda858f83a64e98be7844 + name=2.14.0 + ; commit=4b497cf6445fc515070265721f40ceb816864bf1 + name=2.17.0~ynh1 diff --git a/scripts/upgrade b/scripts/upgrade index ffe98db..0e2df52 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -186,7 +186,8 @@ else popd fi -if [ "$version" -lt "2.15.0" ]; then +if [ dpkg --compare-versions "$version" -lt "2.15.0" ]; then + ynh_script_progression --message="Upgrading for 2.15.0..." pushd "$final_path" php$phpversion artisan monica:moveavatarstophotosdirectory popd