From 14e1508dcf7369a0bc570a7b07785114af6ece08 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 12 Jun 2020 04:01:09 +0200 Subject: [PATCH] fix ynh_composer_exec --- scripts/install | 9 +++------ scripts/upgrade | 6 ++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/scripts/install b/scripts/install index 4c8c67a..81a5284 100644 --- a/scripts/install +++ b/scripts/install @@ -148,16 +148,13 @@ ynh_script_progression --message="Installing composer dependencies..." ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" # Set Flarum version -ynh_composer_exec --user=$app --phpversion=$phpversion --workdir=$final_path \ - --commands="require flarum/core:$core_version --prefer-lowest --no-update" +ynh_composer_exec --user=$app --phpversion=$phpversion --workdir=$final_path --commands="require flarum/core:$core_version --prefer-lowest --no-update" # Require SSOwat extension -ynh_composer_exec --user=$app --phpversion=$phpversion --workdir=$final_path \ - --commands="require tituspijean/flarum-ext-auth-ssowat:$ssowat_version --no-update" +ynh_composer_exec --user=$app --phpversion=$phpversion --workdir=$final_path --commands="require tituspijean/flarum-ext-auth-ssowat:$ssowat_version --no-update" # Update and download dependencies -ynh_composer_exec --user=$app --phpversion=$phpversion --workdir=$final_path \ - --commands="update" +ynh_composer_exec --user=$app --phpversion=$phpversion --workdir=$final_path --commands="update" #================================================= # FLARUM POST-INSTALL diff --git a/scripts/upgrade b/scripts/upgrade index ec300e7..418e01b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -218,10 +218,8 @@ then # Perform migrations and clear cache pushd $final_path ynh_script_progression --message="Upgrading Flarum and its extensions..." --weight=1 - ynh_composer_exec --user=$app --phpversion=$phpversion --workdir=$final_path \ - --commands="require tituspijean/flarum-ext-auth-ssowat:$ssowat_version --no-update" - ynh_composer_exec --user=$app --phpversion=$phpversion --workdir=$final_path \ - --commands="require flarum/core:$core_version --prefer-dist --update-no-dev -a --update-with-all-dependencies" + ynh_composer_exec --user=$app --phpversion=$phpversion --workdir=$final_path --commands="require tituspijean/flarum-ext-auth-ssowat:$ssowat_version --no-update" + ynh_composer_exec --user=$app --phpversion=$phpversion --workdir=$final_path --commands="require flarum/core:$core_version --prefer-dist --update-no-dev -a --update-with-all-dependencies" exec_as $app php$phpversion flarum migrate exec_as $app php$phpversion flarum cache:clear popd