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

[fix] install carddav plugin correctly

Browse source
This commit is contained in:
magikcypress 2017-06-19 00:15:43 +02:00
parent b4541eaabf
commit 83d87a728c
No known key found for this signature in database
GPG key ID: 3B3C7CD61957AC9A
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/_common.sh
View file

@ -104,7 +104,7 @@ init_composer() {
# usage: install_carddav DESTDIR [AS_USER] # usage: install_carddav DESTDIR [AS_USER]
install_carddav() { install_carddav() {
local DESTDIR=$1 local DESTDIR=$1
local AS_USER=${2:-www-data} local AS_USER=${2:-admin}
local carddav_config="${DESTDIR}/plugins/carddav/config.inc.php" local carddav_config="${DESTDIR}/plugins/carddav/config.inc.php"
local carddav_tmp_config="${PKGDIR}/conf/carddav.config.inc.php" local carddav_tmp_config="${PKGDIR}/conf/carddav.config.inc.php"

2
scripts/install
View file

@ -80,7 +80,7 @@ installed_plugins+=" 'contextmenu', 'automatic_addressbook',"
# Install CardDAV plugin # Install CardDAV plugin
if [[ $with_carddav -eq 1 ]]; then if [[ $with_carddav -eq 1 ]]; then
install_carddav "$final_path" \ install_carddav "$final_path" admin \
&& installed_plugins+=" 'carddav'," \ && installed_plugins+=" 'carddav'," \
|| echo "Unable to install CardDAV plugin" >&2 || echo "Unable to install CardDAV plugin" >&2
fi fi