Merge pull request scriptcs#937 from adamralph/936

glennblock · glennblock · commit 81aa4d7f81e0 · 2015-02-23T23:15:02.000-08:00
fix install script for choco &lt; v0.9.8.33
diff --git a/build/ScriptCs.Version.props b/build/ScriptCs.Version.props
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <MajorVersion>0</MajorVersion>
     <MinorVersion>13</MinorVersion>
-    <PatchVersion>2</PatchVersion>
+    <PatchVersion>3</PatchVersion>
 
     <!-- Change this to set the build quality of the project. Use values like "alpha", "beta", "rc1", "rtm", etc. -->
     <!-- These values are used in SemVer, so make sure to always increase these alphabetically. -->
diff --git a/src/ScriptCs/Properties/chocolateyInstall.ps1 b/src/ScriptCs/Properties/chocolateyInstall.ps1
@@ -35,12 +35,12 @@
         # https://github.com/chocolatey/chocolatey/issues/97
         $envPath = $env:PATH
         if ($envPath.ToLower().Contains($_.ToLower())) {
-            $userPath = Get-EnvironmentVariable -Name 'Path' -Scope "User"
+            $userPath = [Environment]::GetEnvironmentVariable("Path","User")
             if($userPath) {
                 $actualPath = [System.Collections.ArrayList]($userPath).Split(";")
                 $actualPath.Remove($_)
                 $newPath =  $actualPath -Join ";"
-                Set-EnvironmentVariable -Name 'Path' -Value $newPath -Scope "User"
+                [Environment]::SetEnvironmentVariable("Path", $newPath, "User")
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,12 @@`
`35`	`35`	`# https://github.com/chocolatey/chocolatey/issues/97`
`36`	`36`	`$envPath = $env:PATH`
`37`	`37`	`if ($envPath.ToLower().Contains($_.ToLower())) {`
`38`		`- $userPath = Get-EnvironmentVariable -Name 'Path' -Scope "User"`
	`38`	`+ $userPath = [Environment]::GetEnvironmentVariable("Path","User")`
`39`	`39`	`if($userPath) {`
`40`	`40`	`$actualPath = [System.Collections.ArrayList]($userPath).Split(";")`
`41`	`41`	`$actualPath.Remove($_)`
`42`	`42`	`$newPath = $actualPath -Join ";"`
`43`		`- Set-EnvironmentVariable -Name 'Path' -Value $newPath -Scope "User"`
	`43`	`+ [Environment]::SetEnvironmentVariable("Path", $newPath, "User")`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`