Merge branch 'stable'

* stable: v0.9.8.27-beta1 (doc) update changelog / nuspec (maint) Debug should capture operating system information (GH-516) If process has not yet exited, wait the process
chocolatey-archive · Jul 13, 2014 · 3c608f2 · 3c608f2
2 parents f9b6061 + b260439
commit 3c608f2
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+##[0.9.8.27](https://github.com/chocolatey/chocolatey/issues?labels=v0.9.8.27&page=1&state=closed) (July 13, 2014)
+
+BUG FIXES:
+
+ * Fix - Posh v3+ Ignores -Wait when run from cmd.exe - [#516](https://github.com/chocolatey/chocolatey/pull/516)
+
 ##[0.9.8.26](https://github.com/chocolatey/chocolatey/issues?labels=v0.9.8.26&page=1&state=closed) (July 12, 2014)
 
 BUG FIXES:

diff --git a/nuget/chocolatey.nuspec b/nuget/chocolatey.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>chocolatey</id>
     <title>Chocolatey</title>
-    <version>0.9.8.26</version>
+    <version>0.9.8.27-beta1</version>
     <authors>Rob Reynolds, The Chocolatey Team</authors>
     <owners>Rob Reynolds</owners>
     <summary>Chocolatey is your machine level NuGet repository. Think apt-get for Windows (executables/application packages), not library packages.</summary>
@@ -41,7 +41,12 @@ Humor related to playing off of tiki gods. We like humor. Don't take life so ser
     <releaseNotes>
 See all - https://github.com/chocolatey/chocolatey/blob/master/CHANGELOG.md
 
-## 0.9.8.26:
+## 0.9.8.27:
+### BUG FIXES:
+
+ * Fix - Posh v3+ Ignores -Wait when run from cmd.exe - https://github.com/chocolatey/chocolatey/pull/516
+
+## 0.9.8.26:
 ### BUG FIXES:
 
  * Fix - Allow spaces in arguments to chocolatey again - Regenerate chocolatey included shims to take advantage of shimgen fixes - https://github.com/chocolatey/chocolatey/issues/507

diff --git a/src/chocolatey.ps1 b/src/chocolatey.ps1
@@ -44,7 +44,7 @@ $currentThread.CurrentCulture = $culture;
 $currentThread.CurrentUICulture = $culture;
 
 #Let's get Chocolatey!
-$chocVer = '0.9.8.26'
+$chocVer = '0.9.8.27-beta1'
 $nugetChocolateyPath = (Split-Path -parent $MyInvocation.MyCommand.Definition)
 $nugetPath = (Split-Path -Parent $nugetChocolateyPath)
 $nugetExePath = Join-Path $nuGetPath 'bin'
@@ -156,10 +156,17 @@ $packageParameters = $packageParameters.Replace("'","""")
 #main entry point
 Append-Log
 
-Write-Debug "Arguments: `$command = '$command'|`$packageNames='$packageNames'|`$source='$source'|`$version='$version'|`$allVersions=$allVersions|`$InstallArguments='$installArguments'|`$overrideArguments=$overrideArgs|`$force=$force|`$prerelease=$prerelease|`$localonly=$localonly|`$verbosity=$verbosity|`$debug=$debug|`$quiet=$quiet|`$name='$name'|`$ignoreDependencies=$ignoreDependencies|`$forceX86=$forceX86|`$packageParameters='$packageParameters'|PowerShellVersion=$($host.version)"
+Write-Debug "Arguments: `$command = '$command'|`$force=$force`
+|`$prerelease=$prerelease|`$packageNames='$packageNames'`
+|`$source='$source'`
+|`$version='$version'|`$allVersions=$allVersions`
+|`$overrideArguments=$overrideArgs|`$InstallArguments='$installArguments'`
+|`$localonly=$localonly|`$verbosity=$verbosity|`$debug=$debug|`$quiet=$quiet`
+|`$name='$name'|`$ignoreDependencies=$ignoreDependencies|`$forceX86=$forceX86`
+|`$packageParameters='$packageParameters'`
+|PowerShellVersion=$($host.version)|OSVersion=$([System.Environment]::OSVersion.Version.ToString())"
 
 # run level environment variables
-
 $env:chocolateyForceX86 = $null
 if ($forceX86) {
   $env:chocolateyForceX86 = $true

diff --git a/src/functions/Chocolatey-Pack.ps1 b/src/functions/Chocolatey-Pack.ps1
@@ -11,7 +11,8 @@ param(
   Write-Host "Calling `'$nugetExe $packageArgs`'."
 
   $process = Start-Process $nugetExe -ArgumentList $packageArgs -NoNewWindow -Wait -RedirectStandardOutput $logFile -RedirectStandardError $errorLogFile -PassThru
-  if ($host.Version.Major -ge 3) { Wait-Process -InputObject $process }
+  # this is here for specific cases in Posh v3 where -Wait is not honored
+  try { if (!($process.HasExited)) { Wait-Process $process } } catch { }
 
   $nugetOutput = Get-Content $logFile -Encoding Ascii
   foreach ($line in $nugetOutput) {

diff --git a/src/functions/Chocolatey-Push.ps1 b/src/functions/Chocolatey-Push.ps1
@@ -18,7 +18,8 @@ param(
   Write-Host "Calling `'$nugetExe $packageArgs`'. This may take a few minutes. Please wait for the command to finish."  -ForegroundColor $Note -BackgroundColor Black
 
   $process = Start-Process $nugetExe -ArgumentList $packageArgs -NoNewWindow -Wait -RedirectStandardOutput $logFile -RedirectStandardError $errorLogFile -PassThru
-  if ($host.Version.Major -ge 3) { Wait-Process -InputObject $process }
+  # this is here for specific cases in Posh v3 where -Wait is not honored
+  try { if (!($process.HasExited)) { Wait-Process $process } } catch { }
 
   $nugetOutput = Get-Content $logFile -Encoding Ascii
   foreach ($line in $nugetOutput) {

diff --git a/src/functions/Chocolatey-Python.ps1 b/src/functions/Chocolatey-Python.ps1
@@ -37,7 +37,8 @@ param(
 
   Write-Host "Opening minimized PowerShell window and calling `'cmd.exe $packageArgs`'. If progress is taking a long time, please check that window. It also may not be 100% silent..." -ForegroundColor $Warning -BackgroundColor Black
   $process = Start-Process -FilePath "$($env:windir)\System32\WindowsPowerShell\v1.0\powershell.exe" -ArgumentList "-NoProfile -ExecutionPolicy unrestricted -Command `"cmd.exe $packageArgs | Tee-Object -FilePath `'$chocoInstallLog`'`"" -Wait -WindowStyle Minimized -PassThru
-  if ($host.Version.Major -ge 3) { Wait-Process -InputObject $process }
+  # this is here for specific cases in Posh v3 where -Wait is not honored
+  try { if (!($process.HasExited)) { Wait-Process $process } } catch { }
 
   Create-InstallLogIfNotExists $chocoInstallLog
   $installOutput = Get-Content $chocoInstallLog -Encoding Ascii

diff --git a/src/helpers/functions/Get-CheckSumValid.ps1 b/src/helpers/functions/Get-CheckSumValid.ps1
@@ -20,7 +20,8 @@ param(
 
   Write-Debug "Calling command [`'$checksumExe`' -c$checksum `"$file`"] to retrieve checksum"
   $process = Start-Process "$checksumExe" -ArgumentList " -c=`"$checksum`" -t=`"$checksumType`" -f=`"$file`"" -Wait -WindowStyle Hidden -PassThru
-  if ($host.Version.Major -ge 3) { Wait-Process -InputObject $process }
+  # this is here for specific cases in Posh v3 where -Wait is not honored
+  try { if (!($process.HasExited)) { Wait-Process $process } } catch { }
 
   Write-Debug "`'$checksumExe`' exited with $($process.ExitCode)"
 

diff --git a/src/helpers/functions/Get-ChocolateyUnzip.ps1 b/src/helpers/functions/Get-ChocolateyUnzip.ps1
@@ -79,9 +79,11 @@ param(
   $exitCode = -1
   $unzipOps = {
     param($7zip, $destination, $fileFullPath, [ref]$exitCodeRef)
-    $p = Start-Process $7zip -ArgumentList "x -o`"$destination`" -y `"$fileFullPath`"" -Wait -WindowStyle Hidden -PassThru
-    if ($host.Version.Major -ge 3) { Wait-Process -InputObject $p }
-    $exitCodeRef.Value = $p.ExitCode
+    $process = Start-Process $7zip -ArgumentList "x -o`"$destination`" -y `"$fileFullPath`"" -Wait -WindowStyle Hidden -PassThru
+    # this is here for specific cases in Posh v3 where -Wait is not honored
+    try { if (!($process.HasExited)) { Wait-Process $process } } catch { }
+
+    $exitCodeRef.Value = $process.ExitCode
   }
 
   if ($zipExtractLogFullPath) {