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: try to manage composer update correctly

Browse source
This commit is contained in:
HugoPoi 2024-02-05 17:13:44 +01:00
parent dfe6ee58dc
commit c913078c29
No known key found for this signature in database
GPG key ID: E581734975D3836F
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/_common.sh
View file

@ -31,14 +31,15 @@ install_ldap_addressbook_contextmenu_plugins() {
# Install net_LDAP
export COMPOSER_ALLOW_SUPERUSER=1
ynh_composer_exec --commands="require kolab/net_ldap3"
ynh_composer_exec --commands="require kolab/net_ldap3 --update-with-all-dependencies"
# Install contextmenu and automatic_addressbook plugins
# https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook
# https://plugins.roundcube.net/packages/johndoh/contextmenu
ynh_composer_exec --commands="require \
johndoh/contextmenu $contextmenu_version \
sblaisot/automatic_addressbook $automatic_addressbook_version"
sblaisot/automatic_addressbook $automatic_addressbook_version \
--update-with-all-dependencies"
installed_plugins+=" 'contextmenu', 'automatic_addressbook',"
@ -48,7 +49,7 @@ install_ldap_addressbook_contextmenu_plugins() {
}
install_carddav_plugin(){
ynh_composer_exec --commands="require roundcube/carddav $carddav_version --with-all-dependencies"
ynh_composer_exec --commands="require roundcube/carddav $carddav_version --update-with-all-dependencies"
carddav_tmp_config="../conf/carddav.config.inc.php"
carddav_server=0

5
scripts/upgrade
View file

@ -82,7 +82,9 @@ ynh_add_nginx_config
#=================================================
# CONFIGURE ROUNDCUBE
#=================================================
ynh_script_progression --message="Updating Roundcube dependencies with Composer..." --weight=30
setup_composer_deps
ynh_composer_exec --commands="update --no-dev"
ynh_script_progression --message="Configuring Roundcube..." --weight=2
configure_roundcube
@ -96,9 +98,6 @@ then
install_carddav_plugin
fi
ynh_script_progression --message="Updating Roundcube dependencies with Composer..." --weight=30
ynh_composer_exec --commands="update --no-dev"
ynh_script_progression --message="Install javascript dependencies..." --weight=10
update_javascript_deps