From 6245d40db722e18bc79096e52ae02f29838e0cf5 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Thu, 24 Dec 2020 10:17:19 +0300 Subject: [PATCH] fix vcpkg output (#2319) --- images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 +- images/macos/software-report/SoftwareReport.Common.psm1 | 2 +- images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 86643fbd..0698f42d 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -138,7 +138,7 @@ function Get-VcpkgVersion { $result.Output -match "version (?\d+\.\d+\.\d+)" | Out-Null $vcpkgVersion = $Matches.version $commitId = git -C "/usr/local/share/vcpkg" rev-parse --short HEAD - return "Vcpkg $vcpkgVersion (build from master <$commitId>)" + return "Vcpkg $vcpkgVersion (build from master \<$commitId>)" } function Get-AntVersion { diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 0f6aba49..ab452cd5 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -57,7 +57,7 @@ function Get-RustupVersion { function Get-VcpkgVersion { $vcpkgVersion = Run-Command "vcpkg version" | Select-Object -First 1 | Take-Part -Part 5 | Take-Part -Part 0 -Delimiter "-" $commitId = git -C "/usr/local/share/vcpkg" rev-parse --short HEAD - return "Vcpkg $vcpkgVersion (build from master <$commitId>)" + return "Vcpkg $vcpkgVersion (build from master \<$commitId>)" } function Get-GccVersion { diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 1a3d3191..84b89326 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -109,7 +109,7 @@ function Get-VcpkgVersion { ($(vcpkg version) | Out-String) -match "version (?\d+\.\d+\.\d+)" | Out-Null $vcpkgVersion = $Matches.Version $commitId = git -C "C:\vcpkg" rev-parse --short HEAD - return "Vcpkg $vcpkgVersion (build from master <$commitId>)" + return "Vcpkg $vcpkgVersion (build from master \<$commitId>)" } function Get-NPMVersion {