Skip to content

Commit

Permalink
Fix check in add_path
Browse files Browse the repository at this point in the history
Add composer_bin to the PATH after a tool is added using composer
  • Loading branch information
shivammathur committed Feb 8, 2022
1 parent 46c34bb commit a72a638
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/scripts/tools/add_tools.ps1
Expand Up @@ -23,7 +23,6 @@ Function Edit-ComposerConfig() {
Set-Content -Path $composer_json -Value "{}"
}
Add-EnvPATH $src\configs\composer.env
Add-Path $composer_bin
if (Test-Path env:COMPOSER_TOKEN) {
Add-Env COMPOSER_AUTH ('{"github-oauth": {"github.com": "' + $env:COMPOSER_TOKEN + '"}}')
}
Expand Down Expand Up @@ -176,6 +175,7 @@ Function Add-ComposertoolHelper() {
Remove-Item -Path $composer_lock -Force
}
composer global require $prefix$release $composer_args >$null 2>&1
Add-Path $composer_bin
return composer global show $prefix$tool 2>&1 | findstr '^versions'
} else {
$release_stream = [System.IO.MemoryStream]::New([System.Text.Encoding]::ASCII.GetBytes($release))
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/tools/add_tools.sh
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/unix.sh
Expand Up @@ -99,7 +99,7 @@ get_shell_profile() {
# Function to add a path to the PATH variable.
add_path() {
path_to_add=$1
[ ! -d "$path_to_add" ] && [[ ":$PATH:" == *":$path_to_add:"* ]] && return
{ [ ! -d "$path_to_add" ] || [[ ":$PATH:" == *":$path_to_add:"* ]]; } && return
if [[ -n "$GITHUB_PATH" ]]; then
echo "$path_to_add" | tee -a "$GITHUB_PATH" >/dev/null 2>&1
else
Expand Down

0 comments on commit a72a638

Please sign in to comment.