From 02a941bc447731e63a4a84005e9a62b455292bc6 Mon Sep 17 00:00:00 2001 From: Mickael-Martin Date: Thu, 10 Oct 2019 13:19:38 +0200 Subject: [PATCH] Update to fix installed version --- scripts/upgrade | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 99881a0..f0a6824 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,6 +15,7 @@ source /usr/share/yunohost/helpers app=$YNH_APP_INSTANCE_NAME trustedversion="4.4-1+stretch" +forceupdate=0 export domain=$(ynh_app_setting_get "$app" domain) export path_url=$(ynh_app_setting_get "$app" path) #admin=$(ynh_app_setting_get "$app" admin) #not used @@ -118,6 +119,12 @@ if [ "$(dpkg -l zabbix-release 2>/dev/null | wc -l)" -ne 0 ];then install_zabbix_repo fi +#patch if zabbix-release has Candidate version but no Installed version +if [ "$(apt-cache policy zabbix-release | sed -n '2p' | grep -Po ".* \K(.*)" | grep -e '(.*)' -c)" -eq 1 ];then + install_zabbix_repo + forceupdate=1 +fi + #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -129,7 +136,7 @@ ynh_package_update zabbixReleaseInstalledVersion=$(apt-cache policy zabbix-release | sed -n '2p' | grep -Po ".* \K(.*)") -if [[ "$trustedversion" > "$zabbixReleaseInstalledVersion" ]] +if [[ "$trustedversion" > "$zabbixReleaseInstalledVersion" ]] || [[ "$forceupdate" == "1" ]] then #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP