From 531fe345a299af8661bf509af6c2d914afd3bff4 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sun, 8 Mar 2020 09:28:50 +0000 Subject: [PATCH] Fix bazelisk and mercurial output in readme (#518) * fix output * fix bazelisk output on ubuntu --- images/linux/scripts/installers/bazel.sh | 2 +- images/win/scripts/Installers/Validate-Bazel.ps1 | 2 +- images/win/scripts/Installers/Validate-Mercurial.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/bazel.sh b/images/linux/scripts/installers/bazel.sh index d6649fcee..d058d5764 100644 --- a/images/linux/scripts/installers/bazel.sh +++ b/images/linux/scripts/installers/bazel.sh @@ -29,7 +29,7 @@ if ! command -v bazelisk; then fi # Document what was added to the image -bazelisk_version = $(bazelisk version | grep "Bazelisk version:" | cut -d ":" -f 2) +bazelisk_version="$(bazelisk version 2>null | grep "Bazelisk version:" | cut -d "v" -f 3)" echo "Lastly, documenting what we added to the metadata file" DocumentInstalledItem "Bazel ($(bazel --version))" diff --git a/images/win/scripts/Installers/Validate-Bazel.ps1 b/images/win/scripts/Installers/Validate-Bazel.ps1 index 3fc0e3d69..9cdccda4d 100644 --- a/images/win/scripts/Installers/Validate-Bazel.ps1 +++ b/images/win/scripts/Installers/Validate-Bazel.ps1 @@ -33,7 +33,7 @@ _Version:_ $(bazel --version)
Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description # Adding description of Bazelisk to Markdown -$bazelisk_version = (bazelisk version | Select-String "Bazelisk version:").Split(":")[1] +$bazelisk_version = ((bazelisk version | Select-String "Bazelisk version:") -Split(" v"))[2] $SoftwareName = "bazelisk" diff --git a/images/win/scripts/Installers/Validate-Mercurial.ps1 b/images/win/scripts/Installers/Validate-Mercurial.ps1 index 6212d5f28..74299f06f 100644 --- a/images/win/scripts/Installers/Validate-Mercurial.ps1 +++ b/images/win/scripts/Installers/Validate-Mercurial.ps1 @@ -15,7 +15,7 @@ else # Adding description of the software to Markdown $SoftwareName = "Mercurial" -$(hg --version).Split([System.Environment]::NewLine)[0] -match "\d+\.\d+\.\d+" +$(hg --version).Split([System.Environment]::NewLine)[0] -match "\d+\.\d+" $MercurialVersion = $matches[0] $Description = @"