diff --git a/scripts/_common.sh b/scripts/_common.sh index eefe918..090d8c1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -16,9 +16,8 @@ carddav_version=5.0.1 # DEFINE ALL COMMON FONCTIONS #================================================= -install_composer() { +setup_composer_deps() { cp "$install_dir/composer.json-dist" "$install_dir/composer.json" - ynh_install_composer } configure_roundcube() { diff --git a/scripts/install b/scripts/install index 4ca8152..ae337be 100644 --- a/scripts/install +++ b/scripts/install @@ -59,7 +59,8 @@ ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name # INSTALL DEPENDENCIES AND PLUGINS #================================================= ynh_script_progression --message="Installing Roundcube with Composer..." --weight=30 -install_composer +setup_composer_deps +ynh_install_composer ynh_script_progression --message="Configuring Roundcube..." --weight=2 configure_roundcube diff --git a/scripts/upgrade b/scripts/upgrade index bf549fc..3929a14 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,7 +83,7 @@ ynh_add_nginx_config # CONFIGURE ROUNDCUBE #================================================= ynh_script_progression --message="Installing Roundcube with Composer..." --weight=30 -install_composer +setup_composer_deps ynh_composer_exec --commands="update --no-dev" ynh_script_progression --message="Configuring Roundcube..." --weight=2