From f02a88ae49f6750e2a406b67a69cbe132d24764a Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 19 Mar 2022 12:28:19 +0100 Subject: [PATCH] Fix regex.py --- scripts/install | 6 +++--- scripts/upgrade | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 7de144b..68422e7 100755 --- a/scripts/install +++ b/scripts/install @@ -95,9 +95,6 @@ cp ../conf/radicale.wsgi $final_path # Copy extra files cp -a ../sources/extra_files_radicale/. "$final_path" -# 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 - if [ $infcloud -eq 1 ] then #Instal InfCloud @@ -159,6 +156,9 @@ virtualenv /opt/yunohost/$app version=$(ynh_app_setting_get --app=$app --key=version) /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 + # useradd radicale -d /opt/yunohost/$app chown radicale: -R /opt/yunohost/$app diff --git a/scripts/upgrade b/scripts/upgrade index 41c32d7..a99dac5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -164,9 +164,6 @@ then # Copy extra files cp -a ../sources/extra_files_radicale/. "$final_path" - # 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 - if [ "$infcloud" = "1" ] then #Instal InfCloud @@ -252,6 +249,9 @@ then 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" + + # 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 fi chown radicale: -R /opt/yunohost/$app