mirror of
https://github.com/YunoHost-Apps/roundcube_ynh.git
synced 2024-09-03 20:16:28 +02:00
Merge pull request #80 from YunoHost-Apps/support_buster
Support buster
This commit is contained in:
commit
4d68dbfaa5
3 changed files with 21 additions and 3 deletions
|
@ -5,7 +5,7 @@
|
|||
#=================================================
|
||||
|
||||
# Package dependencies
|
||||
pkg_dependencies="php-cli php-common php-intl php-json php-pear php-auth-sasl php-mail-mime php-patchwork-utf8 php-net-smtp php-net-socket php-net-ldap2 php-net-ldap3 php-zip php-gd php-mbstring php-curl"
|
||||
pkg_dependencies="php-cli php-common php-intl php-json php-pear php-auth-sasl php-mail-mime php-patchwork-utf8 php-net-smtp php-net-socket php-zip php-gd php-mbstring php-curl"
|
||||
|
||||
# Plugins version
|
||||
contextmenu_version=2.3
|
||||
|
|
|
@ -142,6 +142,9 @@ ynh_script_progression --message="Installing additional plugins..." --weight=60
|
|||
# Create logs and temp directories
|
||||
mkdir -p "$final_path/"{logs,temp}
|
||||
|
||||
# Install net_LDAP
|
||||
ynh_composer_exec --commands="require kolab/net_ldap3"
|
||||
|
||||
# Install contextmenu and automatic_addressbook plugins
|
||||
# https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook
|
||||
# https://plugins.roundcube.net/packages/johndoh/contextmenu
|
||||
|
@ -157,6 +160,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 +169,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,7 +183,11 @@ then
|
|||
# Copy the plugin configuration file
|
||||
cp "$carddav_tmp_config" ""$final_path/plugins/carddav/config.inc.php""
|
||||
|
||||
installed_plugins+=" 'carddav',"
|
||||
# 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
|
||||
|
|
|
@ -184,6 +184,9 @@ then
|
|||
# Create logs and temp directories
|
||||
mkdir -p "$final_path/"{logs,temp}
|
||||
|
||||
# Install net_LDAP
|
||||
ynh_composer_exec --commands="require kolab/net_ldap3"
|
||||
|
||||
# Update or install contextmenu and automatic_addressbook plugins
|
||||
# https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook
|
||||
# https://plugins.roundcube.net/packages/johndoh/contextmenu
|
||||
|
@ -199,6 +202,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"
|
||||
|
@ -207,6 +211,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)
|
||||
|
@ -220,7 +225,11 @@ then
|
|||
# Copy the plugin configuration file
|
||||
cp "$carddav_tmp_config" ""$final_path/plugins/carddav/config.inc.php""
|
||||
|
||||
installed_plugins+=" 'carddav',"
|
||||
# Do not actually 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
|
||||
|
|
Loading…
Add table
Reference in a new issue