From 7edda0f115cdc1c45ae8160af0208814a38527fe Mon Sep 17 00:00:00 2001 From: Mark Tiedemann Date: Wed, 23 Jan 2019 22:25:36 +0100 Subject: [PATCH] Fix PowerShell IsWindows usage (#32) --- install.ps1 | 19 ++++++++----------- install_test.ps1 | 12 +++++------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/install.ps1 b/install.ps1 index f23fdf6..dbc892c 100644 --- a/install.ps1 +++ b/install.ps1 @@ -10,41 +10,38 @@ param ( $ErrorActionPreference = 'Stop' if ($PSVersionTable.PSVersion.Major -lt 6) { - $IsWin = $true - $IsOsx = $false -} else { - $IsWin = $IsWindows - $IsOsx = $IsMacOS + $IsWindows = $true + $IsMacOS = $false } -$BinDir = if ($IsWin) { +$BinDir = if ($IsWindows) { "$Home\.deno\bin" } else { "$Home/.deno/bin" } -$Zip = if ($IsWin) { +$Zip = if ($IsWindows) { 'zip' } else { 'gz' } -$DenoZip = if ($IsWin) { +$DenoZip = if ($IsWindows) { "$BinDir\deno.$Zip" } else { "$BinDir/deno.$Zip" } -$DenoExe = if ($IsWin) { +$DenoExe = if ($IsWindows) { "$BinDir\deno.exe" } else { "$BinDir/deno" } -$OS = if ($IsWin) { +$OS = if ($IsWindows) { 'win' } else { - if ($IsOsx) { + if ($IsMacOS) { 'osx' } else { 'linux' diff --git a/install_test.ps1 b/install_test.ps1 index 843012a..520e345 100644 --- a/install_test.ps1 +++ b/install_test.ps1 @@ -10,16 +10,14 @@ if (!(Get-Module PSScriptAnalyzer -ListAvailable)) { Install-Module PSScriptAnalyzer -Scope CurrentUser -Force } -Invoke-ScriptAnalyzer *.ps1 -EnableExit +Invoke-ScriptAnalyzer *.ps1 -Exclude PSAvoidAssignmentToAutomaticVariable -$IsWin = if ($PSVersionTable.PSVersion.Major -lt 6) { - $true -} else { - $IsWindows +if ($PSVersionTable.PSVersion.Major -lt 6) { + $IsWindows = $true } .\install.ps1 v0.2.0 -$DenoVersion = if ($IsWin) { +$DenoVersion = if ($IsWindows) { deno --version } else { ~/.deno/bin/deno --version @@ -31,7 +29,7 @@ if (!($DenoVersion[0] -eq 'deno: 0.2.0')) { } .\install.ps1 -$DenoVersion = if ($IsWin) { +$DenoVersion = if ($IsWindows) { deno --version } else { ~/.deno/bin/deno --version