diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index a6699496..76648089 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -118,6 +118,7 @@ $toolsList = @( (Get-M4Version), (Get-HGVersion), (Get-MinikubeVersion), + (Get-NetToolsVersion), (Get-NewmanVersion), (Get-NvmVersion), (Get-PackerVersion), diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index ef663547..b2dfa7ba 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -174,6 +174,11 @@ function Get-MediainfoVersion { return "MediaInfo $mediainfoVersion" } +function Get-NetToolsVersion { + $netToolsVersion = dpkg-query --showformat='${Version}' --show net-tools | Take-OutputPart -Part 0 -Delimiter '-' | Take-OutputPart -Part 0 -Delimiter '+' + return "net-tools $netToolsVersion" +} + function Get-NewmanVersion { return "Newman $(newman --version)" } diff --git a/images/linux/scripts/tests/Apt.Tests.ps1 b/images/linux/scripts/tests/Apt.Tests.ps1 index 3fc00f2c..0913ade5 100644 --- a/images/linux/scripts/tests/Apt.Tests.ps1 +++ b/images/linux/scripts/tests/Apt.Tests.ps1 @@ -34,6 +34,11 @@ Describe "Apt" { $toolName = "tr" } + if ($toolName -eq "net-tools") + { + $toolName = "netstat" + } + (Get-Command -Name $toolName).CommandType | Should -BeExactly "Application" } } \ No newline at end of file diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 8c93b4ee..889f1a35 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -194,6 +194,7 @@ "m4", "mediainfo", "netcat", + "net-tools", "p7zip-full", "parallel", "pass", diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index f001f1a2..96ea8428 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -188,6 +188,7 @@ "m4", "mediainfo", "netcat", + "net-tools", "parallel", "pass", "p7zip-full", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 3766233d..0fa65538 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -168,6 +168,7 @@ "m4", "mediainfo", "netcat", + "net-tools", "p7zip-full", "parallel", "pass",