Merge branch 'stable'

* stable: (version) 0.9.9.4 (doc) update changelog / nuspec (GH-207) pass switches correctly (GH-215) The term 'false' is not recognized
chocolatey · Mar 30, 2015 · 1d6c362 · 1d6c362
2 parents ce90c21 + 694ce8a
commit 1d6c362
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 9 deletions.
diff --git a/.uppercut b/.uppercut
@@ -18,7 +18,7 @@
   <property name="version.major" value="0" overwrite="false" />
   <property name="version.minor" value="9" overwrite="false" />
   <property name="version.patch" value="9" overwrite="false" />
-  <property name="version.fix" value="3" overwrite="false" />
+  <property name="version.fix" value="4" overwrite="false" />
   <property name="version.nuget.prerelease" value="" overwrite="false" />
   <property name="version.use.build_date" value="false" overwrite="false" />
   <property name="assembly.description" value="${project.name} is a product of ${company.name} - All Rights Reserved." overwrite="false" />

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,14 @@
-## [0.9.9.3](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.9.3+is%3Aclosed) (March 29, 2015)
+## [0.9.9.4](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.9.4+is%3Aclosed) (March 30, 2015)
+
+### BUG FIXES
+
+ * Fix - The term 'false' is not recognized as the name of a cmdlet - see [#215](https://github.com/chocolatey/choco/issues/215)
+
+### IMPROVEMENTS
+
+ * Some packages use non-API variables like $installArguments - see [#207](https://github.com/chocolatey/choco/issues/207)
+
+ ## [0.9.9.3](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.9.3+is%3Aclosed) (March 29, 2015)
 
 ### BUG FIXES
 

diff --git a/nuget/chocolatey/chocolatey.nuspec b/nuget/chocolatey/chocolatey.nuspec
@@ -40,6 +40,16 @@ In that mess there is a link to the [Helper Reference](https://github.com/chocol
     <releaseNotes>
 See all - https://github.com/chocolatey/choco/blob/master/CHANGELOG.md
 
+## 0.9.9.4
+
+### BUG FIXES
+
+ * Fix - The term 'false' is not recognized as the name of a cmdlet - see [#215](https://github.com/chocolatey/choco/issues/215)
+
+### IMPROVEMENTS
+
+ * Some packages use non-API variables like $installArguments - see [#207](https://github.com/chocolatey/choco/issues/207)
+
 ## 0.9.9.3
 
 ### BUG FIXES

diff --git a/src/chocolatey.resources/helpers/chocolateyInstaller.psm1 b/src/chocolatey.resources/helpers/chocolateyInstaller.psm1
@@ -21,11 +21,11 @@ if ($env:ChocolateyEnvironmentVerbose -eq 'true') { $VerbosePreference = "Contin
 
 $installArguments = $env:chocolateyInstallArguments
 
-$overrideArgs = false
-if ($env:chocolateyInstallOverride -eq 'true') { $overrideArgs = true }
+$overrideArgs = $false
+if ($env:chocolateyInstallOverride -eq 'true') { $overrideArgs = $true }
 
-$forceX86 = false
-if ($env:chocolateyForceX86 -eq 'true') { $forceX86 = true }
+$forceX86 = $false
+if ($env:chocolateyForceX86 -eq 'true') { $forceX86 = $true }
 
 $packageParameters = $env:chocolateyPackageParameters
 

diff --git a/src/chocolatey/infrastructure.app/services/PowershellService.cs b/src/chocolatey/infrastructure.app/services/PowershellService.cs
@@ -110,12 +110,12 @@ public string wrap_script_with_module(string script, ChocolateyConfiguration con
 
         private string get_script_arguments(string script, ChocolateyConfiguration config)
         {
-            return "-packageScript '{0}' -installArguments '{1}' -forceX86 {2} -packageParameters '{3}' -overrideArgs {4}".format_with(
+            return "-packageScript '{0}' -installArguments '{1}' -packageParameters '{2}'{3}{4}".format_with(
                 script,
                 config.InstallArguments,
-                config.ForceX86 ? "$true" : "$false",
                 config.PackageParameters,
-                config.OverrideArguments ? "$true" : "$false"
+                config.ForceX86 ? " -forceX86" : string.Empty,
+                config.OverrideArguments ? " -overrideArgs" : string.Empty
              );
         }