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:
parent
884bff0e71
commit
fcda1eb2e8
1 changed files with 7 additions and 1 deletions
|
@ -157,6 +157,7 @@ then
|
|||
ynh_composer_exec --commands="require roundcube/carddav $carddav_version"
|
||||
|
||||
carddav_tmp_config="../conf/carddav.config.inc.php"
|
||||
carddav_server=0
|
||||
|
||||
# Look for installed and supported CardDAV servers
|
||||
for carddav_app in "owncloud" "nextcloud" "baikal"
|
||||
|
@ -165,6 +166,7 @@ then
|
|||
--output-as json | grep -Po '"id":[ ]?"\K.*?(?=")' | head -1)
|
||||
if [ -n "$carddav_app_id" ]
|
||||
then
|
||||
carddav_server=1
|
||||
# Retrieve app settings and enable relevant preset
|
||||
carddav_domain=$(ynh_app_setting_get --app=$carddav_app_id --key=domain)
|
||||
carddav_path=$(ynh_app_setting_get --app=$carddav_app_id --key=path)
|
||||
|
@ -178,8 +180,12 @@ then
|
|||
# Copy the plugin configuration file
|
||||
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',"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Install Enigma plugin
|
||||
if [ $with_enigma -eq 1 ]
|
||||
|
|
Loading…
Reference in a new issue