1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/radicale_ynh.git synced 2024-09-03 20:16:14 +02:00

Fix regex.py

This commit is contained in:
yalh76 2022-03-19 12:28:19 +01:00
parent 5dda621fbd
commit f02a88ae49
2 changed files with 6 additions and 6 deletions

View file

@ -95,9 +95,6 @@ cp ../conf/radicale.wsgi $final_path
# Copy extra files # Copy extra files
cp -a ../sources/extra_files_radicale/. "$final_path" 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 ] if [ $infcloud -eq 1 ]
then then
#Instal InfCloud #Instal InfCloud
@ -159,6 +156,9 @@ virtualenv /opt/yunohost/$app
version=$(ynh_app_setting_get --app=$app --key=version) version=$(ynh_app_setting_get --app=$app --key=version)
/opt/yunohost/$app/bin/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
# useradd radicale -d /opt/yunohost/$app # useradd radicale -d /opt/yunohost/$app
chown radicale: -R /opt/yunohost/$app chown radicale: -R /opt/yunohost/$app

View file

@ -164,9 +164,6 @@ then
# Copy extra files # Copy extra files
cp -a ../sources/extra_files_radicale/. "$final_path" 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" ] if [ "$infcloud" = "1" ]
then then
#Instal InfCloud #Instal InfCloud
@ -252,6 +249,9 @@ then
virtualenv /opt/yunohost/$app virtualenv /opt/yunohost/$app
version=$(ynh_app_setting_get $app version $version) version=$(ynh_app_setting_get $app version $version)
bash -c "source /opt/yunohost/radicale/bin/activate && pip install radicale==$version python-ldap" 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 fi
chown radicale: -R /opt/yunohost/$app chown radicale: -R /opt/yunohost/$app