Merge branch 'master' of https://github.com/nikita-bykov/virtual-environments into macos-docs

images/macos/software-report/SoftwareReport.Common.psm1

@@ -58,7 +58,7 @@ function Get-GccVersion {
     $versionList = @("8", "9")
     $versionList | Foreach-Object {
         $version = Run-Command "gcc-${_} --version" | Select-Object -First 1
-        "$version  — available by ``gcc-${_}`` alias"
+        "$version - available by ``gcc-${_}`` alias"
     }
 }
 
@@ -66,7 +66,7 @@ function Get-FortranVersion {
     $versionList = @("8", "9")
     $versionList | Foreach-Object {
         $version = Run-Command "gfortran-${_} --version" | Select-Object -First 1
-        "$version  — available by ``gfortran-${_}`` alias"
+        "$version  - available by ``gfortran-${_}`` alias"
     }
 }
 

images/macos/software-report/SoftwareReport.Generator.ps1

@@ -77,7 +77,6 @@ $homebrewVersion = Run-Command "brew --version" | Select-Object -First 1
 $npmVersion = Run-Command "npm --version"
 $yarnVersion = Run-Command "yarn --version"
 $nugetVersion = Run-Command "nuget help" | Select-Object -First 1 | Take-Part -Part 2
-$pipVersion = Get-PipVersion -Version 2
 $pip3Version = Get-PipVersion -Version 3
 $condaVersion = Invoke-Expression "conda --version"
 $rubyGemsVersion = Run-Command "gem --version"
@@ -88,7 +87,13 @@ if ($os.IsHigherThanMojave) {
     $vcpkgVersion = Get-VcpkgVersion
     $markdown += New-MDList -Lines $vcpkgVersion -Style Unordered -NoNewLine
 }
+if ($os.IsLessThanBigSur) {
+    $pipVersion = Get-PipVersion -Version 2
+    $markdown += New-MDList -Style Unordered -Lines @("Pip ${pipVersion}") -NoNewLine
+}
+
 $markdown += New-MDList -Style Unordered -Lines @(
+    "Pip ${pip3Version}",
     $bundlerVersion,
     "Carthage ${carthageVersion}",
     "CocoaPods ${cocoaPodsVersion}",
@@ -96,8 +101,6 @@ $markdown += New-MDList -Style Unordered -Lines @(
     "NPM ${npmVersion}",
     "Yarn ${yarnVersion}",
     "NuGet ${nugetVersion}",
-    "Pip ${pipVersion}",
-    "Pip ${pip3Version}",
     "Mini${condaVersion}",
     "RubyGems ${rubyGemsVersion}",
     "Composer ${composerVersion}"
@@ -124,7 +127,6 @@ $gitLFSVersion = Run-Command "git-lfs version" | Take-Part -Part 0 | Take-Part -
 $hubVersion = Run-Command "hub version | grep 'hub version'" | Take-Part -Part 2
 $wgetVersion = Run-Command "wget --version" | Select-String "GNU Wget" | Take-Part -Part 2
 $svnVersion = Run-Command "svn --version --quiet"
-$parallelVersion = Run-Command "parallel --version" | Select-String "GNU parallel" | Select-Object -First 1
 $jqVersion = Run-Command "jq --version" | Take-Part -Part 1 -Delimiter "-"
 $opensslVersion = Get-Item /usr/local/opt/openssl | ForEach-Object {"{0} ``({1} -> {2})``" -f (Run-Command "openssl version"), $_.FullName, $_.Target}
 $gpgVersion = Run-Command "gpg --version" | Select-String 'gpg (GnuPG)' -SimpleMatch
@@ -153,7 +155,6 @@ $markdown += New-MDList -Style Unordered -NoNewLine -Lines @(
     "GNU Wget ${wgetVersion}",
     "Subversion (SVN) ${svnVersion}",
     "Packer $packerVersion",
-    $parallelVersion,
     $opensslVersion,
     "jq ${jqVersion}",
     $gpgVersion,
@@ -173,7 +174,11 @@ $markdown += New-MDList -Style Unordered -NoNewLine -Lines @(
 )
 if ($os.IsHigherThanMojave) {
     $newmanVersion = Run-Command "newman --version"
-    $markdown += New-MDList -Lines "Newman $newmanVersion" -Style Unordered
+    $markdown += New-MDList -Lines "Newman $newmanVersion" -Style Unordered -NoNewLine
+}
+if ($os.IsLessThanBigSur) {
+    $parallelVersion = Run-Command "parallel --version" | Select-String "GNU parallel" | Select-Object -First 1
+    $markdown += New-MDList -Lines $parallelVersion -Style Unordered
 }
 $markdown += New-MDNewLine
 

images/macos/software-report/SoftwareReport.Xcode.psm1

@@ -1,3 +1,7 @@
+Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
+
+$os = Get-OSVersion
+
 function Get-XcodePaths {
     $xcodePaths = Get-ChildItemWithoutSymlinks "/Applications" -Filter "Xcode_*.app"
     return $xcodePaths | Select-Object -ExpandProperty Fullname
@@ -43,7 +47,7 @@ function Get-XcodeInfoList {
         $versionInfo.Path = $xcodeRootPath
         $versionInfo.IsDefault = ($xcodeRootPath -eq $defaultXcodeRootPath)
     
-        $xcodeInfo.Add($versionInfo.Version.ToString(), [PSCustomObject] @{
+        $xcodeInfo.Add($xcodeRootPath, [PSCustomObject] @{
             VersionInfo = $versionInfo
             SDKInfo = Get-XcodeSDKList
             SimulatorsInfo = Get-XcodeSimulatorsInfo
@@ -217,20 +221,27 @@ function Build-XcodeSimulatorsTable {
 }
 
 function Build-XcodeSupportToolsSection {
-    $nomadCLI = Run-Command "gem -v nomad-cli"
-    $nomadIPA = Run-Command "ipa -version"
     $xcpretty = Run-Command "xcpretty --version"
-    $xctool = Run-Command "xctool --version"
     $xcversion = Run-Command "xcversion --version" | Select-String "^[0-9]"
 
+    $toolList = @(
+        "xcpretty $xcpretty",
+        "xcversion $xcversion"
+    )
+
+    if ($os.IsLessThanBigSur) {
+        $nomadCLI = Run-Command "gem -v nomad-cli"
+        $nomadIPA = Run-Command "ipa -version"
+        $xctool = Run-Command "xctool --version"
+        $toolList += @(
+            "Nomad CLI $nomadCLI",
+            "Nomad CLI IPA $nomadIPA",
+            "xctool $xctool"
+        )
+    }
+
     $output = ""
     $output += New-MDHeader "Xcode Support Tools" -Level 4
-    $output += New-MDList -Style Unordered -Lines @(
-        "Nomad CLI $nomadCLI",
-        "Nomad CLI IPA $nomadIPA",
-        "xcpretty $xcpretty",
-        "xctool $xctool",
-        "xcversion $xcversion"
-    ) 
+    $output += New-MDList -Style Unordered -Lines $toolList
     return $output
 }