diff --git a/scripts/_common.sh b/scripts/_common.sh index 090d8c1..ea8d380 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -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 diff --git a/scripts/upgrade b/scripts/upgrade index fe6ab3b..de29bf4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -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