Ensure choco bin is ahead of boxstarter vendored choco bin on the pat…

…h and dont copy redirect shims to choco bin even if choco is not preinstalled
chocolatey · Jul 1, 2015 · 2970508 · 2970508
1 parent 7cced0f
commit 2970508
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Boxstarter.Chocolatey/install-chocolatey.ps1 b/Boxstarter.Chocolatey/install-chocolatey.ps1
@@ -42,16 +42,14 @@ function Install-Chocolatey($pkgUrl) {
 "@
 
     if(!(Test-Path $chocoBinPath)){
-        Copy-Item -Path $boxBinPath -Destination $chocoBinPath -Recurse
+        New-Item -Path $chocoBinPath -ItemType Directory
     }
 
     $currentEnv = [Environment]::GetEnvironmentVariable('path', 'Machine')
-    $newEnv = $currentEnv.Replace($boxBinPath, '')
-    if($newEnv.IndexOf($chocoBinPath) -eq -1) {
-        $newEnv += $chocoBinPath + ';'
+    if($currentEnv.IndexOf($chocoBinPath) -eq -1) {
+        $currentEnv = $currentEnv.replace($boxBinPath, "$chocoBinPath;$boxBinPath")
     }
-    $newEnv = $newEnv.Replace(';;', ';')
-    [Environment]::SetEnvironmentVariable("path", $newEnv, 'Machine')
+    [Environment]::SetEnvironmentVariable("path", $currentEnv, 'Machine')
   }
   finally {
     $env:ChocolateyInstall = $currentChocoInstall

diff --git a/BuildScripts/releaseNotes.xml b/BuildScripts/releaseNotes.xml
@@ -1,4 +1,5 @@
 <releaseNotes>
+- Ensure choco bin is ahead of boxstarter vendored choco bin on the path and dont copy redirect shims to choco bin even if choco is not preinstalled.
 - Provide better isolation between Boxstarter and User Chocolatey installations.
 - Run scheduled tasks in the same directory where it is invoked.
 - Default Windows Update criteria now only installs critical updates.