From 4f00d9bbfc2f63f74ef675988541e37e3a5503a9 Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@gmail.com>
Date: Tue, 24 Mar 2020 17:11:27 +0300
Subject: [PATCH] Add tool versions to description

---
 .../win/scripts/Installers/Validate-Msys2.ps1 | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/images/win/scripts/Installers/Validate-Msys2.ps1 b/images/win/scripts/Installers/Validate-Msys2.ps1
index b8eac3aa..7bed9c9f 100644
--- a/images/win/scripts/Installers/Validate-Msys2.ps1
+++ b/images/win/scripts/Installers/Validate-Msys2.ps1
@@ -35,12 +35,33 @@ try {
 
 # Adding description of the software to Markdown
 
-# $SoftwareName = "MSYS2"
-# $(pacman.exe --version).Split([System.Environment]::NewLine)[1] -match "v\d+\.\d+\.\d+"
-# $pacmanVersion = $matches[0]
+function Get-ToolVersion {
+    param(
+        [string] $ToolPath,
+        [int] $VersionLineNumber
+    )
 
-# $Description = @"
-# _Pacman version:_ $pacmanVersion<br/>
-# "@
+    $toolRawVersion = Invoke-Expression "$ToolPath --version"
+    $toolRawVersion.Split([System.Environment]::NewLine)[$VersionLineNumber] -match "\d+\.\d+(\.\d+)?"
+    $toolVersion = $matches[0]
+    return $toolVersion
+}
 
-# Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
+$SoftwareName = "MSYS2"
+$pacmanVersion = Get-ToolVersion -ToolPath "$msys2BinDir/pacman" -VersionLineNumber 1
+$bashVersion = Get-ToolVersion -ToolPath "$msys2BinDir/bash" -VersionLineNumber 0
+$gccVersion = Get-ToolVersion -ToolPath "$msys2mingwDir/gcc" -LineNumber 0
+$tarVersion = Get-ToolVersion -ToolPath "$msys2BinDir/tar" -LineNumber 0
+$makeVersion = Get-ToolVersion -ToolPath "$msys2BinDir/make" -LineNumber 0
+$cmakeVersion = Get-ToolVersion -ToolPath "$msys2mingwDir/cmake" -LineNumber 0
+
+$Description = @"
+_Pacman version:_ $pacmanVersion<br/>
+_Bash:_ $bashVersion<br/>
+_gcc:_ $gccVersion<br/>
+_tar:_ $tarVersion<br/>
+_make:_ $makeVersion<br/>
+_cmake:_ $cmakeVersion<br/>
+"@
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description