From 6ebd1e5184814e07cf68df5e68d1984940fddcd5 Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Mon, 26 Apr 2021 06:55:12 +0530
Subject: [PATCH] Fix versions of composer tools

---
 src/scripts/common.sh | 9 +++++----
 src/scripts/win32.ps1 | 8 +++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/scripts/common.sh b/src/scripts/common.sh
index 3b5c489e..35d3f148 100644
--- a/src/scripts/common.sh
+++ b/src/scripts/common.sh
@@ -206,7 +206,8 @@ add_unstable_extension() {
 get_tool_version() {
   tool=$1
   param=$2
-  version_regex="[0-9]+((\.{1}[0-9]+)+)(\.{0})(-[a-zA-Z0-9]+){0,1}"
+  alp="[a-zA-Z0-9]"
+  version_regex="[0-9]+((\.{1}$alp+)+)(\.{0})(-$alp+){0,1}"
   if [ "$tool" = "composer" ]; then
     if [ "$param" != "snapshot" ]; then
       composer_version="$(grep -Ea "const\sVERSION" "$tool_path_dir/composer" | grep -Eo "$version_regex")"
@@ -283,9 +284,9 @@ add_composertool() {
   fi
   (
     sudo rm -f "$composer_lock" >/dev/null 2>&1 || true
-    composer global require "$prefix$release" >/dev/null 2>&1
-    json=$(grep "$prefix$tool" "$composer_json") &&
-      tool_version=$(get_tool_version 'echo' "$json") &&
+    composer global require "$prefix$release" 2>&1 | tee /tmp/composer.log >/dev/null 2>&1
+    log=$(grep "$prefix$tool" /tmp/composer.log) &&
+      tool_version=$(get_tool_version 'echo' "$log") &&
       add_log "$tick" "$tool" "Added $tool $tool_version"
   ) || add_log "$cross" "$tool" "Could not setup $tool"
   add_tools_helper "$tool"
diff --git a/src/scripts/win32.ps1 b/src/scripts/win32.ps1
index 3a02983b..f70b38bf 100644
--- a/src/scripts/win32.ps1
+++ b/src/scripts/win32.ps1
@@ -225,7 +225,8 @@ Function Get-ToolVersion() {
       [Parameter(Position = 1, Mandatory = $true)]
       $param
   )
-  $version_regex = "[0-9]+((\.{1}[0-9]+)+)(\.{0})(-[a-z0-9]+){0,1}"
+  $alp = "[a-zA-Z0-9]"
+  $version_regex = "[0-9]+((\.{1}$alp+)+)(\.{0})(-$alp+){0,1}"
   if($tool -eq 'composer') {
     if ($param -eq 'snapshot') {
       $composer_version = (Select-String -Pattern "const\sBRANCH_ALIAS_VERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value }) + '+' + (Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern "[a-zA-Z0-9]+" -AllMatches | ForEach-Object { $_.matches[2].Value })
@@ -314,14 +315,15 @@ Function Add-Composertool() {
   if(Test-Path $composer_lock) {
     Remove-Item -Path $composer_lock -Force
   }
-  composer global require $prefix$release >$null 2>&1
+  (composer global require $prefix$release 2>&1 | Tee-Object -FilePath $env:APPDATA\Composer\composer.log) >$null 2>&1
   $json = findstr $prefix$tool $env:APPDATA\Composer\composer.json
+  $log = findstr $prefix$tool $env:APPDATA\Composer\composer.log
   if(Test-Path $composer_bin\composer) {
     Copy-Item -Path "$bin_dir\composer" -Destination "$composer_bin\composer" -Force
   }
   Add-ToolsHelper $tool
   if($json) {
-    $tool_version = Get-ToolVersion "Write-Output" "$json"
+    $tool_version = Get-ToolVersion "Write-Output" "$log"
     Add-Log $tick $tool "Added $tool $tool_version"
   } else {
     Add-Log $cross $tool "Could not setup $tool"