Merge branch 'stable'

* stable: (doc) formatting (version) 0.9.9.6 (GH-274) install - fix unpack self (doc) setting release date to today
chocolatey · May 17, 2015 · 1eea36d · 1eea36d
2 parents 9417a5b + 636d601
commit 1eea36d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 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="5" overwrite="false" />
+  <property name="version.fix" value="6" 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,8 +1,8 @@
-## [0.9.9.6](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.9.6+is%3Aclosed) (unreleased)
+## [0.9.9.6](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.9.6+is%3Aclosed) (May 16, 2015)
 
 Some really large fixes this release, especially removing all files that are installed to the package directory if they haven't changed, including ensuring that the nupkg file is always removed on successful uninstalls. The really big add some folks are going to like is the new outdated command. Some more variables that were misused have been brought back, which allows some packages (like Atom) to be installed again without issue. If you can believe some people never read these, we decided to add a note to the installer prompt to let people know about -y.
 
-### FEATURES
+### FEATURES
 
  * Outdated Command - Use `choco outdated` to see outdated packages - see [#170](https://github.com/chocolatey/choco/issues/170)
 
@@ -64,7 +64,7 @@ Some really large fixes this release, especially removing all files that are ins
 
  * 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)
+## [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/tools/chocolateysetup.psm1 b/nuget/chocolatey/tools/chocolateysetup.psm1
@@ -4,7 +4,7 @@ $sysDrive = $env:SystemDrive
 $tempDir = $env:TEMP
 $defaultChocolateyPathOld = "$sysDrive\Chocolatey"
 #$ErrorActionPreference = 'Stop'
-$debugModeParams = ""
+$debugModeParams = $null
 
 function Initialize-Chocolatey {
 <#
@@ -34,13 +34,13 @@ param(
   Write-Debug "Initialize-Chocolatey"
 
   if ($env:ChocolateyEnvironmentDebug -eq 'true') {
-    $debugModeParams = "dv"
+    $debugModeParams = '-dv'
   }
 
   Install-DotNet4IfMissing
 
   $chocoNew = Join-Path $thisScriptFolder 'chocolateyInstall\choco.exe'
-  & $chocoNew unpackself -fy$debugModeParams
+  & $chocoNew unpackself -fy $debugModeParams
 
   $installModule = Join-Path $thisScriptFolder 'chocolateyInstall\helpers\chocolateyInstaller.psm1'
   Import-Module $installModule -Force
@@ -309,7 +309,7 @@ param(
   $chocoExeDest = Join-Path $chocolateyPath 'choco.exe'
   Copy-Item $chocoExe $chocoExeDest -force
 
-  & $chocoExeDest unpackself -fy$debugModeParams
+  & $chocoExeDest unpackself -fy $debugModeParams
 }
 
 function Ensure-ChocolateyLibFiles {