From 051662b3adb1d035b4b49e094f32a486b29c31c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Sat, 9 Jun 2018 22:58:14 +0200
Subject: [PATCH] Fix stretch dependances

---
 manifest.json      | 2 +-
 scripts/_common.sh | 2 +-
 scripts/upgrade    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 02243d4..03a3f09 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "A groupware (webmail, adressbook, calendar) witch use PHP",
         "fr": "Un groupware (webmail, carnet adresses, agenda), utilisant PHP."
     },
-    "version": "5.2.22~ynh2",
+    "version": "5.2.22~ynh3",
     "url": "https://www.horde.org/",
     "license": "LGPL-2.0",
     "maintainer": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index fb88f9d..42b3a14 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -13,7 +13,7 @@ gollem_data_dir="/home/yunohost.app/$app"
 #=================================================
 
 install_dependance() {
-    ynh_install_app_dependencies php-pear expect php5-imagick php5-tidy
+    ynh_install_app_dependencies php-pear expect 'php5-imagick|php-imagick' 'php5-tidy|php-tidy'
 }
 
 patch_app() {
diff --git a/scripts/upgrade b/scripts/upgrade
index fbb4477..a890469 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -46,7 +46,7 @@ install_dependance
 # Upgrade Horde by PEAR
 pear_cmd="$final_path/pear/pear -c $final_path/pear.conf"
 $pear_cmd channel-update pear.horde.org
-$pear_cmd upgrade -R $final_path -a -B -c pear.horde.org
+$pear_cmd upgrade -R $final_path -a -B -c pear.horde.org || true
 
 # Patch the app
 patch_app