Skip to content

Commit 66f2447

Browse files
committed
Fix reading composer package type for older versions
1 parent e57ea71 commit 66f2447

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/scripts/tools/add_tools.ps1

+5-1
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,15 @@ Function Add-ComposertoolHelper() {
201201
[string]
202202
$composer_args
203203
)
204+
$tool_version = $release.split(':')[1]
205+
if($NULL -eq $tool_version) {
206+
$tool_version = '*'
207+
}
204208
if($scope -eq 'global') {
205209
if(Test-Path $composer_lock) {
206210
Remove-Item -Path $composer_lock -Force
207211
}
208-
if((composer global show $prefix$tool -a 2>&1 | findstr '^type *: *composer-plugin') -and ($composer_args -ne '')) {
212+
if((composer global show $prefix$tool $tool_version -a 2>&1 | findstr '^type *: *composer-plugin') -and ($composer_args -ne '')) {
209213
composer global config --no-plugins allow-plugins."$prefix$tool" true >$null 2>&1
210214
}
211215
composer global require $prefix$release $composer_args >$null 2>&1

src/scripts/tools/add_tools.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,10 @@ add_composertool_helper() {
160160
scope=$4
161161
composer_args=$5
162162
enable_extensions curl mbstring openssl
163+
tool_version=${release##*:}; [ "$tool_version" = "$tool" ] && tool_version="*"
163164
if [ "$scope" = "global" ]; then
164165
sudo rm -f "$composer_lock" >/dev/null 2>&1 || true
165-
if composer global show "$prefix$tool" -a 2>&1 | grep -qE '^type *: *composer-plugin' && [ -n "$composer_args" ]; then
166+
if composer global show "$prefix$tool" "$tool_version" -a 2>&1 | grep -qE '^type *: *composer-plugin' && [ -n "$composer_args" ]; then
166167
composer global config --no-plugins allow-plugins."$prefix$tool" true >/dev/null 2>&1
167168
fi
168169
composer global require "$prefix$release" "$composer_args" >/dev/null 2>&1
@@ -172,7 +173,7 @@ add_composertool_helper() {
172173
if ! [ -d "$scoped_dir" ]; then
173174
mkdir -p "$scoped_dir"
174175
echo '{}' | tee "$scoped_dir/composer.json" >/dev/null
175-
if composer show "$prefix$tool" -d "$scoped_dir" -a 2>&1 | grep -qE '^type *: *composer-plugin' && [ -n "$composer_args" ]; then
176+
if composer show "$prefix$tool" "$tool_version" -d "$scoped_dir" -a 2>&1 | grep -qE '^type *: *composer-plugin' && [ -n "$composer_args" ]; then
176177
composer config -d "$scoped_dir" --no-plugins allow-plugins."$prefix$tool" true >/dev/null 2>&1
177178
fi
178179
composer require "$prefix$release" -d "$scoped_dir" "$composer_args" >/dev/null 2>&1

0 commit comments

Comments
 (0)