From 5ed29a44dc88fd592b9e257598f3b6a86f1e724c Mon Sep 17 00:00:00 2001 From: Gavin Eke Date: Mon, 26 Mar 2018 15:41:06 +1100 Subject: [PATCH 1/2] Add macos detection to New-CommandDataFile --- Utils/New-CommandDataFile.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Utils/New-CommandDataFile.ps1 b/Utils/New-CommandDataFile.ps1 index 5000e0a2f..be7b5939c 100644 --- a/Utils/New-CommandDataFile.ps1 +++ b/Utils/New-CommandDataFile.ps1 @@ -56,6 +56,10 @@ Function Get-CmdletDataFileName { $os = 'linux' } + elseif ($IsMacOS) + { + $os = 'macos' + } elseif ($IsOSX) { $os = 'osx' @@ -112,4 +116,4 @@ Add-Member -InputObject $shortModuleInfo -NotePropertyName 'ExportedAliases' -No $allShortModuleInfos = $shortModuleInfos + $shortModuleInfo $jsonData['Modules'] = $allShortModuleInfos -$jsonData | ConvertTo-Json -Depth 4 | Out-File ((Get-CmdletDataFileName)) -Encoding utf8 \ No newline at end of file +$jsonData | ConvertTo-Json -Depth 4 | Out-File ((Get-CmdletDataFileName)) -Encoding utf8 From a37f9d5cd320e9a19d3fa28f01850f54fc54e5e7 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Mon, 26 Mar 2018 07:42:55 +0100 Subject: [PATCH 2/2] Remove old 'elseif ($IsOSX)' since there is no need to support old Beta versions. --- Utils/New-CommandDataFile.ps1 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Utils/New-CommandDataFile.ps1 b/Utils/New-CommandDataFile.ps1 index be7b5939c..4f986ef55 100644 --- a/Utils/New-CommandDataFile.ps1 +++ b/Utils/New-CommandDataFile.ps1 @@ -60,10 +60,6 @@ Function Get-CmdletDataFileName { $os = 'macos' } - elseif ($IsOSX) - { - $os = 'osx' - } # else it is windows, which is already set } $sb = New-Object 'System.Text.StringBuilder'