From 2804f62ac45cd5e9562a953c21c9d1d57768bb6a Mon Sep 17 00:00:00 2001
From: jarod5001 <68397534+jarod5001@users.noreply.github.com>
Date: Fri, 15 Apr 2022 04:20:59 +0100
Subject: [PATCH 1/3] Update install

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

diff --git a/scripts/install b/scripts/install
index 772298a..2c6e1e1 100755
--- a/scripts/install
+++ b/scripts/install
@@ -149,7 +149,7 @@ python3 -m venv /opt/yunohost/$app
 set +u;
 source /opt/yunohost/$app/bin/activate
 set -u;
-pip install radicale==$version python3-ldap
+pip install --no-cache-dir radicale==$version python3-ldap
 set +u;
 deactivate
 set -u;

From f227beb98246ef8e3576b56ee73bcb07c940060e Mon Sep 17 00:00:00 2001
From: jarod5001 <68397534+jarod5001@users.noreply.github.com>
Date: Fri, 15 Apr 2022 04:24:04 +0100
Subject: [PATCH 2/3] Update upgrade

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 5c2aa9e..b4546ee 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -232,7 +232,7 @@ then
 	set +u;
 	source /opt/yunohost/$app/bin/activate
 	set -u;
-	pip install radicale==$version python3-ldap
+	pip install --no-cache-dir radicale==$version python3-ldap
 	set +u;
 	deactivate
 	set -u;

From e1e45e69c294ae42e056871f2daeb72954fbbee9 Mon Sep 17 00:00:00 2001
From: jarod5001 <68397534+jarod5001@users.noreply.github.com>
Date: Sat, 16 Apr 2022 01:34:39 +0100
Subject: [PATCH 3/3] Update upgrade

/var/www/radicale/regex.py doesn't exist!
Fix chmod 2755 > chmod 755
Removed chmod 777
---
 scripts/upgrade | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index b4546ee..117b320 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -171,7 +171,7 @@ chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
 chmod 666 -R $final_path/default_collections
-chmod 777 $final_path/default_collections $final_path/default_collections/USER
+chmod 755 $final_path/default_collections $final_path/default_collections/USER
 
 #=================================================
 # NGINX CONFIGURATION
@@ -238,11 +238,11 @@ then
 	set -u;
 
 	# 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
+	# mv "$final_path/regex.py" /opt/yunohost/$app/lib/python*/site-packages/radicale/rights/regex.py
 fi
 
 chown radicale: -R /opt/yunohost/$app
-find /opt/yunohost/$app/ -type d -exec chmod 2755 {} \;
+find /opt/yunohost/$app/ -type d -exec chmod 755 {} \;
 find /opt/yunohost/$app/ -type f -exec chmod g+r,o+r {} \;
 
 #=================================================