Merge branch 'stable'

* stable: (version) 0.9.9.9 (GH-346) additional cleanup # Conflicts: # .uppercut
chocolatey · Oct 3, 2015 · 70bba8c · 70bba8c
2 parents 65a269f + 28d8b48
commit 70bba8c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1 b/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1
@@ -45,8 +45,6 @@ param(
   Write-Debug "Executing command ['$checksumExe' $params]"
   $process = New-Object System.Diagnostics.Process
   $process.StartInfo = New-Object System.Diagnostics.ProcessStartInfo($checksumExe, $params)
-  $process.StartInfo.RedirectStandardOutput = $true
-  $process.StartInfo.RedirectStandardError = $true
   $process.StartInfo.UseShellExecute = $false
   $process.StartInfo.WindowStyle = [System.Diagnostics.ProcessWindowStyle]::Hidden
 
@@ -57,7 +55,7 @@ param(
 
   Write-Debug "Command [`'$checksumExe`' $params] exited with `'$exitCode`'."
 
-  if ($process.ExitCode -ne 0) {
+  if ($exitCode -ne 0) {
     throw "Checksum for `'$file'` did not meet `'$checksum`' for checksum type `'$checksumType`'."
   }
 

diff --git a/src/chocolatey.resources/helpers/functions/Get-ChocolateyUnzip.ps1 b/src/chocolatey.resources/helpers/functions/Get-ChocolateyUnzip.ps1
@@ -98,8 +98,6 @@ param(
     Write-Debug "Executing command ['$7zip' $params]"
     $process = New-Object System.Diagnostics.Process
     $process.StartInfo = new-object System.Diagnostics.ProcessStartInfo($7zip, $params)
-    $process.StartInfo.RedirectStandardOutput = $true
-    $process.StartInfo.RedirectStandardError = $true
     $process.StartInfo.UseShellExecute = $false
     $process.StartInfo.WindowStyle = [System.Diagnostics.ProcessWindowStyle]::Hidden