- исправлено определение пути к choco в install.ps1 при установке…

… на машину без chocolatey (#29)
Metrolog · Oct 2, 2017 · 010c92b · 010c92b
1 parent 98701f9
commit 010c92b
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/install/install.ps1 b/install/install.ps1
@@ -86,16 +86,17 @@ $null = (
 
 if ( -not ( $env:APPVEYOR -eq 'True' ) ) {
     $null = Install-Package -Name chocolatey -MinimumVersion 0.9.10.3 -ProviderName Chocolatey;
-    $choco = Join-Path `
-        -Path (
-            Join-Path `
-                -Path ( [Environment]::GetEnvironmentVariable( 'ChocolateyInstall', [System.EnvironmentVariableTarget]::Machine ) ) `
-                -ChildPath 'bin' `
-        ) `
-        -ChildPath 'choco.exe' `
-    ;
-
+};
+$choco = Join-Path `
+    -Path (
+        Join-Path `
+            -Path ( [Environment]::GetEnvironmentVariable( 'ChocolateyInstall', [System.EnvironmentVariableTarget]::Machine ) ) `
+            -ChildPath 'bin' `
+    ) `
+    -ChildPath 'choco.exe' `
+;
 
+if ( -not ( $env:APPVEYOR -eq 'True' ) ) {
     & $choco install cygwin --confirm --failonstderr | Out-String -Stream | Write-Verbose;
     $env:CygWin = Get-ItemPropertyValue `
         -Path HKLM:\SOFTWARE\Cygwin\setup `