From c163b42bfacc2a3f1f4cdb711eda184a7a2751de Mon Sep 17 00:00:00 2001
From: pp-r <64266134+pp-r@users.noreply.github.com>
Date: Wed, 13 Apr 2022 21:08:02 +0200
Subject: [PATCH 1/2] Update to version 1.1.7

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index eaca62e..9209029 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "CalDAV (calendar) and CardDAV (contact) synchronization server",
 		"fr": "Serveur de synchronisation CalDAV et CardDAV"
 	},
-	"version": "1.1.6~ynh6",
+	"version": "1.1.7~ynh1",
 	"url": "http://radicale.org",
     "upstream": {
         "license": "GPL-3.0,AGPL-3.0",

From 06f014c0e6ca18b2adf8902fd6172503161f9e72 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 14 Apr 2022 21:25:26 +0200
Subject: [PATCH 2/2] Fix upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index b7612d2..66d4b00 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -230,7 +230,7 @@ then
 	ynh_secure_remove --file="/opt/yunohost/$app"
 	virtualenv /opt/yunohost/$app
 	version=$(ynh_app_setting_get $app version $version)
-	bash -c "source /opt/yunohost/radicale/bin/activate && pip install radicale==$version python-ldap"
+	/opt/yunohost/$app/bin/pip install radicale==$version python-ldap
 
 	# regex.py file is patched to fix the awful commit e807c3d35bea9cfcfcacac83b1b17d748ea15a39 that stop the reading of "rights" file after the first match.
 	mv "$final_path/regex.py" /opt/yunohost/$app/lib/python*/site-packages/radicale/rights/regex.py