From 7e4e97b9d9b4e2bfc4ac13c462a947d244a43e69 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Mon, 21 Dec 2020 20:00:51 +0100 Subject: [PATCH] [Ubuntu] Add pass package (#2304) Co-authored-by: CrazyMax --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 +++++ images/linux/toolsets/toolset-1604.json | 1 + images/linux/toolsets/toolset-1804.json | 1 + images/linux/toolsets/toolset-2004.json | 1 + 5 files changed, 9 insertions(+) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index f9c2cfd3..2d3a5bff 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -112,6 +112,7 @@ $toolsList = @( (Get-NewmanVersion), (Get-NvmVersion), (Get-PackerVersion), + (Get-PassVersion), (Get-PhantomJSVersion), (Get-PulumiVersion), (Get-RVersion), diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 624e5167..937d5aca 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -175,6 +175,11 @@ function Get-PackerVersion { return "Packer $(packer --version)" } +function Get-PassVersion { + $passVersion = (pass version | Select-String "^=\s+v").Line.Replace('v','') | Take-OutputPart -Part 1 + return "pass $passVersion" +} + function Get-PhantomJSVersion { return "PhantomJS $(phantomjs --version)" } diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index c7e08688..1ee8a2a5 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -168,6 +168,7 @@ "mediainfo", "netcat", "parallel", + "pass", "patchelf", "rsync", "shellcheck", diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 38b91f16..84976666 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -163,6 +163,7 @@ "mediainfo", "netcat", "parallel", + "pass", "patchelf", "rsync", "shellcheck", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 90891270..0fa2e990 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -137,6 +137,7 @@ "mediainfo", "netcat", "parallel", + "pass", "patchelf", "rsync", "shellcheck",