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

No carddav plugin without a server !

What the fuck !!! What an idea to add the plugin without a server, it breaks roundcube !
This commit is contained in:
Maniack Crudelis 2020-04-24 13:31:55 +02:00 committed by GitHub
parent 884bff0e71
commit fcda1eb2e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -157,6 +157,7 @@ then
ynh_composer_exec --commands="require roundcube/carddav $carddav_version" ynh_composer_exec --commands="require roundcube/carddav $carddav_version"
carddav_tmp_config="../conf/carddav.config.inc.php" carddav_tmp_config="../conf/carddav.config.inc.php"
carddav_server=0
# Look for installed and supported CardDAV servers # Look for installed and supported CardDAV servers
for carddav_app in "owncloud" "nextcloud" "baikal" for carddav_app in "owncloud" "nextcloud" "baikal"
@ -165,6 +166,7 @@ then
--output-as json | grep -Po '"id":[ ]?"\K.*?(?=")' | head -1) --output-as json | grep -Po '"id":[ ]?"\K.*?(?=")' | head -1)
if [ -n "$carddav_app_id" ] if [ -n "$carddav_app_id" ]
then then
carddav_server=1
# Retrieve app settings and enable relevant preset # Retrieve app settings and enable relevant preset
carddav_domain=$(ynh_app_setting_get --app=$carddav_app_id --key=domain) carddav_domain=$(ynh_app_setting_get --app=$carddav_app_id --key=domain)
carddav_path=$(ynh_app_setting_get --app=$carddav_app_id --key=path) carddav_path=$(ynh_app_setting_get --app=$carddav_app_id --key=path)
@ -178,7 +180,11 @@ then
# Copy the plugin configuration file # Copy the plugin configuration file
cp "$carddav_tmp_config" ""$final_path/plugins/carddav/config.inc.php"" cp "$carddav_tmp_config" ""$final_path/plugins/carddav/config.inc.php""
# Do not actualy add the carddav plugin if there's no carddav server available...
if [ $carddav_server -eq 1 ]
then
installed_plugins+=" 'carddav'," installed_plugins+=" 'carddav',"
fi
fi fi
# Install Enigma plugin # Install Enigma plugin