From b5101b7e1cca7bd7d87d6051c4059f2e5bf5c61b Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 5 Jul 2020 17:20:00 +0200 Subject: [PATCH 1/2] [fix] set COMPOSER_HOME before building plugins --- scripts/install | 3 +++ scripts/upgrade | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index a37e8de..888a4be 100644 --- a/scripts/install +++ b/scripts/install @@ -139,6 +139,9 @@ admin_mail=$(ynh_user_get_info $admin 'mail') #================================================= ynh_print_info --message="Building plugins..." +mkdir -p "$final_path/include/plugins/build/.config/composer" +export COMPOSER_HOME="$final_path/include/plugins/build/.config/composer" + pushd "$final_path/include/plugins/build" php make.php hydrate php -dphar.readonly=0 make.php build auth-cas diff --git a/scripts/upgrade b/scripts/upgrade index c48c528..8e39797 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -82,14 +82,14 @@ ynh_abort_if_errors if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_print_info --message="Upgrading source files..." - + tmpdir="$(mktemp -d)" mkdir $tmpdir/plugins rsync -a "$final_path/include/plugins" "$tmpdir/." rsync -a "$config_file" "$tmpdir/." ynh_secure_remove --file="$final_path" - + # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" ynh_setup_source --dest_dir="$final_path/include/plugins/build" --source_id="core-plugins" @@ -150,6 +150,8 @@ ynh_print_info --message="Building plugins..." if [ "$upgrade_type" == "UPGRADE_APP" ] then + mkdir -p "$final_path/include/plugins/build/.config/composer" + export COMPOSER_HOME="$final_path/include/plugins/build/.config/composer" pushd "$final_path/include/plugins/build" php make.php hydrate php -dphar.readonly=0 make.php build auth-cas From 383a68cb9e98786365c03d68fb2a816111b0500a Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 7 Jul 2020 22:46:48 +0200 Subject: [PATCH 2/2] [enh] no need to export COMPOSER_HOME --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 888a4be..fdc3b5d 100644 --- a/scripts/install +++ b/scripts/install @@ -140,7 +140,7 @@ admin_mail=$(ynh_user_get_info $admin 'mail') ynh_print_info --message="Building plugins..." mkdir -p "$final_path/include/plugins/build/.config/composer" -export COMPOSER_HOME="$final_path/include/plugins/build/.config/composer" +COMPOSER_HOME="$final_path/include/plugins/build/.config/composer" pushd "$final_path/include/plugins/build" php make.php hydrate diff --git a/scripts/upgrade b/scripts/upgrade index 8e39797..74dc963 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -151,7 +151,7 @@ ynh_print_info --message="Building plugins..." if [ "$upgrade_type" == "UPGRADE_APP" ] then mkdir -p "$final_path/include/plugins/build/.config/composer" - export COMPOSER_HOME="$final_path/include/plugins/build/.config/composer" + COMPOSER_HOME="$final_path/include/plugins/build/.config/composer" pushd "$final_path/include/plugins/build" php make.php hydrate php -dphar.readonly=0 make.php build auth-cas