From f415c1f30f7267c9db5e98945730cb442ab75e43 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Fri, 4 Dec 2020 10:21:12 +0300 Subject: [PATCH] [Ubuntu] Fix version output for vcpkg (#2140) * change version output for vcpkg * change commit id to short * minor change --- images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 462be1fb..39e3abc6 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -133,7 +133,8 @@ function Get-VcpkgVersion { $result = Get-CommandResult "vcpkg version" $result.Output -match "version (?\d+\.\d+\.\d+)" | Out-Null $vcpkgVersion = $Matches.version - return "Vcpkg $vcpkgVersion" + $commitId = git -C "/usr/local/share/vcpkg" rev-parse --short HEAD + return "Vcpkg $vcpkgVersion (build from master <$commitId>)" } function Get-AntVersion {