actions/setup-php
1
0
Fork 0
mirror of https://github.com/shivammathur/setup-php.git synced 2025-11-12 20:23:00 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix check in add_path

Browse Source 
Add composer_bin to the PATH after a tool is added using composer
This commit is contained in:
Shivam Mathur
2022-02-09 00:53:56 +05:30
parent 46c34bb6a5
commit a72a638da4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scripts/tools/add_tools.sh
View File

@ -43,7 +43,6 @@ configure_composer() {
chmod 644 "$composer_json"
fi
add_env_path "${src:?}"/configs/composer.env
add_path "$composer_bin"
if [ -n "$COMPOSER_TOKEN" ]; then
add_env COMPOSER_AUTH '{"github-oauth": {"github.com": "'"$COMPOSER_TOKEN"'"}}'
fi
@ -138,6 +137,7 @@ add_composertool_helper() {
sudo rm -f "$composer_lock" >/dev/null 2>&1 || true
composer global require "$prefix$release" "$composer_args" >/dev/null 2>&1
composer global show "$prefix$tool" 2>&1 | grep -E ^versions | sudo tee /tmp/composer.log >/dev/null 2>&1
add_path "$composer_bin"
else
scoped_dir="$composer_bin/_tools/$tool-$(echo -n "$release" | shasum -a 256 | cut -d ' ' -f 1)"
if ! [ -d "$scoped_dir" ]; then