Remove duplicates from Ubuntu docs (#3066)

images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1

@@ -95,17 +95,13 @@ $markdown += New-MDList -Style Unordered -Lines ($projectManagementList | Sort-O
 
 $markdown += New-MDHeader "Tools" -Level 3
 $toolsList = @(
-    (Get-7zipVersion),
     (Get-AnsibleVersion),
     (Get-AptFastVersion),
     (Get-AzCopyVersion),
     (Get-BazelVersion),
     (Get-BazeliskVersion),
-    (Get-BinUtilsVersion),
     (Get-CodeQLBundleVersion),
-    (Get-CoreUtilsVersion),
     (Get-CMakeVersion),
-    (Get-CurlVersion),
     (Get-DockerMobyClientVersion),
     (Get-DockerMobyServerVersion),
     (Get-DockerComposeVersion),
@@ -123,33 +119,25 @@ $toolsList = @(
     (Get-KustomizeVersion),
     (Get-LeiningenVersion),
     (Get-MediainfoVersion),
-    (Get-M4Version),
     (Get-HGVersion),
     (Get-MinikubeVersion),
-    (Get-NetToolsVersion),
     (Get-NewmanVersion),
     (Get-NvmVersion),
     (Get-OpensslVersion),
     (Get-PackerVersion),
-    (Get-PassVersion),
     (Get-PhantomJSVersion),
     (Get-PulumiVersion),
     (Get-RVersion),
     (Get-SphinxVersion),
-    (Get-SwigVersion),
-    (Get-TerraformVersion),
-    (Get-UnZipVersion),
-    (Get-WgetVersion),
-    (Get-YamllintVersion),
-    (Get-ZipVersion),
-    (Get-ZstdVersion)
+    (Get-TerraformVersion)
 )
 
 if (-not (Test-IsUbuntu16)) {
     $toolsList += @(
         (Get-PodManVersion),
         (Get-BuildahVersion),
-        (Get-SkopeoVersion)
+        (Get-SkopeoVersion),
+        (Get-YamllintVersion)
     )
 }
 

images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1

@@ -1,8 +1,3 @@
-function Get-7zipVersion {
-    $7zVersion = 7z i | Select-String "7-Zip" | Take-OutputPart -Part 2
-    return "7-Zip $7zVersion"
-}
-
 function Get-AnsibleVersion {
     $ansibleVersion = ansible --version | Select-Object -First 1 | Take-OutputPart -Part 1
     return "Ansible $ansibleVersion"
@@ -29,12 +24,6 @@ function Get-BazeliskVersion {
     return "Bazelisk $bazeliskVersion"
 }
 
-function Get-BinUtilsVersion {
-    $result = Get-CommandResult "dpkg-query --show binutils"
-    $binUtilsVersion = $result.Output| Take-OutputPart -Part 1 -Delimiter "`t" | Take-OutputPart -Part 0 -Delimiter "-"
-    return "binutils $binUtilsVersion"
-}
-
 function Get-CodeQLBundleVersion {
     $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*"
     $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName
@@ -43,12 +32,6 @@ function Get-CodeQLBundleVersion {
     return "CodeQL Action Bundle $CodeQLVersion"
 }
 
-function Get-CoreUtilsVersion {
-    $result = Get-CommandResult "dpkg-query --show coreutils"
-    $coreUtilsVersion = $result.Output | Take-OutputPart -Part 1 -Delimiter "`t" | Take-OutputPart -Part 0 -Delimiter "-"
-    return "coreutils $coreUtilsVersion"
-}
-
 function Get-PodManVersion {
     $podmanVersion = podman --version | Take-OutputPart -Part 2
     return "Podman $podmanVersion"
@@ -69,11 +52,6 @@ function Get-CMakeVersion {
     return "CMake $cmakeVersion"
 }
 
-function Get-CurlVersion {
-    $curlVersion = curl --version | Select-Object -First 1 | Take-OutputPart -Part 0,1
-    return $curlVersion
-}
-
 function Get-DockerComposeVersion {
     $composeVersion = docker-compose -v | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter ","
     return "Docker Compose $composeVersion"
@@ -160,11 +138,6 @@ function Get-HGVersion {
     return "Mercurial $hgVersion"
 }
 
-function Get-M4Version {
-    $m4Version = m4 --version | Select-Object -First 1 | Take-OutputPart -Part -1
-    return "m4 $m4Version"
-}
-
 function Get-LeiningenVersion {
     return "$(lein -v | Take-OutputPart -Part 0,1)"
 }
@@ -174,11 +147,6 @@ 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)"
 }
@@ -192,44 +160,14 @@ 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)"
 }
 
-function Get-SwigVersion {
-    $swigVersion = swig -version | Select-String "SWIG Version" | Take-OutputPart -Part 2
-    return "Swig $swigVersion"
-}
-
 function Get-TerraformVersion {
     return (terraform version | Select-String "^Terraform").Line.Replace('v','')
 }
 
-function Get-UnZipVersion {
-    $unzipVersion = unzip -v | Select-Object -First 1 | Take-OutputPart -Part 1
-    return "unzip $unzipVersion"
-}
-
-function Get-WgetVersion {
-    $wgetVersion = wget --version | Select-Object -First 1 | Take-OutputPart -Part 2
-    return "wget $wgetVersion"
-}
-
-function Get-ZipVersion {
-    $zipVersion = zip -v | Select-String "This is Zip" | Take-OutputPart -Part 3
-    return "zip $zipVersion"
-}
-
-function Get-ZstdVersion {
-    $zstdVersion = (zstd --version).Split() -match "v\d+" | ForEach-Object {$_.Replace("v","").Replace(",","")}
-    return "zstd $zstdVersion"
-}
-
 function Get-JqVersion {
     $jqVersion = jq --version | Take-OutputPart -Part 1 -Delimiter "-"
     return "jq $jqVersion"