YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

helpers2.1: rework ynh_install_composer to wget the actual composer.phar instead of calling the unecessarily complex composer install script

Browse source
This commit is contained in:
Alexandre Aubin 2024-06-10 16:30:28 +02:00
parent cbc68afea4
commit f2f8b3e319
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
helpers/helpers.v2.1.d/php
View file

@ -320,15 +320,21 @@ ynh_install_composer() {
local workdir
local install_args
ynh_handle_getopts_args "$@"
# ===========================================
workdir="${workdir:-$install_dir}"
install_args="${install_args:-}"
# ===========================================
curl -sS https://getcomposer.org/installer \
| COMPOSER_HOME="$workdir/.composer" \
php${phpversion} -- --quiet --install-dir="$workdir" --version=$YNH_COMPOSER_VERSION \
|| ynh_die --message="Unable to install Composer."
local composer_url="https://getcomposer.org/download/$YNH_COMPOSER_VERSION/composer.phar"
[[ ! -e "$workdir/composer.phar" ]] || ynh_safe_rm $workdir/composer.phar
# NB. we have to declare the var as local first,
# otherwise 'local foo=$(false) || echo 'pwet'" does'nt work
# because local always return 0 ...
local out
# Timeout option is here to enforce the timeout on dns query and tcp connect (c.f. man wget)
out=$(wget --tries 3 --no-dns-cache --timeout 900 --no-verbose --output-document=$workdir $composer_url 2>&1) \
|| ynh_die --message="$out"
# install dependencies
ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev $install_args" \