Merge pull request #1787 from akv-platform/al-cheb/macos-fix-bazelisk-version

[macOS] Fix bazelisk version output in SoftwareReport.Generator.ps1 script
This commit is contained in:
Maxim Lobanov
2020-10-13 09:27:54 +03:00
committed by GitHub
@@ -141,7 +141,7 @@ $aria2Version = Run-Command "aria2c --version" | Select-Object -First 1 | Take-P
$azcopyVersion = Run-Command "azcopy --version" | Take-Part -Part 2 $azcopyVersion = Run-Command "azcopy --version" | Take-Part -Part 2
$zstdVersion = Run-Command "zstd --version" | Take-Part -Part 1 -Delimiter "v" | Take-Part -Part 0 -Delimiter "," $zstdVersion = Run-Command "zstd --version" | Take-Part -Part 1 -Delimiter "v" | Take-Part -Part 0 -Delimiter ","
$bazelVersion = Run-Command "bazel --version" | Take-Part -Part 0 -Delimiter "-" $bazelVersion = Run-Command "bazel --version" | Take-Part -Part 0 -Delimiter "-"
$bazeliskVersion = Run-Command "bazelisk version" | Select-String "Bazelisk version:" | Take-Part -Part 1 -Delimiter ":" $bazeliskVersion = Run-Command "brew list bazelisk --versions"
$packerVersion = Run-Command "packer --version" $packerVersion = Run-Command "packer --version"
$helmVersion = Run-Command "helm version --short" $helmVersion = Run-Command "helm version --short"
$mongo = Run-Command "mongo --version" | Select-String "MongoDB shell version" | Take-Part -Part 3 $mongo = Run-Command "mongo --version" | Select-String "MongoDB shell version" | Take-Part -Part 3
@@ -167,7 +167,7 @@ $markdown += New-MDList -Style Unordered -NoNewLine -Lines @(
"azcopy $azcopyVersion", "azcopy $azcopyVersion",
"zstd $zstdVersion", "zstd $zstdVersion",
$bazelVersion, $bazelVersion,
"bazelisk $($bazeliskVersion.Trim())", $bazeliskVersion,
"helm $helmVersion", "helm $helmVersion",
"mongo $mongo", "mongo $mongo",
"mongod $mongod", "mongod $mongod",