(chocolatey-archiveGH-571) Use process id instead of name

When waiting for a process to exit, use the id of the process as name may cause errors if the name if is incorrect versus the actual process name. ID is deterministic so should have less chance for error.
ferventcoder · Nov 2, 2014 · d6068c2 · d6068c2
1 parent c2d2261
commit d6068c2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/functions/Chocolatey-Pack.ps1 b/src/functions/Chocolatey-Pack.ps1
@@ -12,7 +12,7 @@ param(
 
   $process = Start-Process $nugetExe -ArgumentList $packageArgs -NoNewWindow -Wait -RedirectStandardOutput $logFile -RedirectStandardError $errorLogFile -PassThru
   # this is here for specific cases in Posh v3 where -Wait is not honored
-  try { if (!($process.HasExited)) { Wait-Process $process } } catch { }
+  try { if (!($process.HasExited)) { Wait-Process -Id $process.Id } } 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
@@ -19,7 +19,7 @@ param(
 
   $process = Start-Process $nugetExe -ArgumentList $packageArgs -NoNewWindow -Wait -RedirectStandardOutput $logFile -RedirectStandardError $errorLogFile -PassThru
   # this is here for specific cases in Posh v3 where -Wait is not honored
-  try { if (!($process.HasExited)) { Wait-Process $process } } catch { }
+  try { if (!($process.HasExited)) { Wait-Process -Id $process.Id } } 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
@@ -38,7 +38,7 @@ 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
   # this is here for specific cases in Posh v3 where -Wait is not honored
-  try { if (!($process.HasExited)) { Wait-Process $process } } catch { }
+  try { if (!($process.HasExited)) { Wait-Process -Id $process.Id } } 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
@@ -21,7 +21,7 @@ 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
   # this is here for specific cases in Posh v3 where -Wait is not honored
-  try { if (!($process.HasExited)) { Wait-Process $process } } catch { }
+  try { if (!($process.HasExited)) { Wait-Process -Id $process.Id } } catch { }
 
   Write-Debug "`'$checksumExe`' exited with $($process.ExitCode)"
 

diff --git a/src/helpers/functions/Get-ChocolateyUnzip.ps1 b/src/helpers/functions/Get-ChocolateyUnzip.ps1
@@ -81,7 +81,7 @@ param(
     param($7zip, $destination, $fileFullPath, [ref]$exitCodeRef)
     $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 { }
+    try { if (!($process.HasExited)) { Wait-Process -Id $process.Id } } catch { }
 
     $exitCodeRef.Value = $process.ExitCode
   }