From a29a65011e66cc6b724cf6d7ff415e4be9dd8dee Mon Sep 17 00:00:00 2001 From: Damien Solodow Date: Tue, 20 Mar 2018 20:57:47 -0400 Subject: [PATCH 1/2] Resolve $Linux error --- scripts/Install-VSCode.ps1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/Install-VSCode.ps1 b/scripts/Install-VSCode.ps1 index 9e392b052d..d7d1874c5e 100644 --- a/scripts/Install-VSCode.ps1 +++ b/scripts/Install-VSCode.ps1 @@ -1,6 +1,6 @@ <#PSScriptInfo -.VERSION 1.1 +.VERSION 1.2 .GUID 539e5585-7a02-4dd6-b9a6-5dd288d0a5d0 @@ -25,6 +25,8 @@ .EXTERNALSCRIPTDEPENDENCIES .RELEASENOTES + 20/03/2018 - fix OS detection to prevent error + -- 28/12/2017 - added functionality to support 64-bit versions of VSCode & support for installation of VSCode Insiders Edition. -- @@ -129,7 +131,7 @@ param( [switch]$LaunchWhenDone ) -if (!($IsLinux -or $IsOSX)) { +if ($env:windir -ne $null) { switch ($Architecture) { "64-bit" { if ((Get-CimInstance -ClassName Win32_OperatingSystem).OSArchitecture -eq "64-bit") { From e24f098d4140db582a0ec1c70e21a849294aa69d Mon Sep 17 00:00:00 2001 From: Damien Solodow Date: Wed, 21 Mar 2018 09:31:24 -0400 Subject: [PATCH 2/2] Update Install-VSCode.ps1 Change test for "isWindows" --- scripts/Install-VSCode.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Install-VSCode.ps1 b/scripts/Install-VSCode.ps1 index d7d1874c5e..773e4deb98 100644 --- a/scripts/Install-VSCode.ps1 +++ b/scripts/Install-VSCode.ps1 @@ -131,7 +131,7 @@ param( [switch]$LaunchWhenDone ) -if ($env:windir -ne $null) { +if (($PSVersionTable.PSVersion.Major -le 5) -or $IsWindows) { switch ($Architecture) { "64-bit" { if ((Get-CimInstance -ClassName Win32_OperatingSystem).OSArchitecture -eq "64-bit") {