Auto merge of #107843 - bjorn3:sync_cg_clif-2023-02-09, r=bjorn3

[rust.git] / x.ps1

diff --git a/x.ps1 b/x.ps1
index 8f2d724a8d05227fee480b13d4004b33a97772d2..f324a4676c8e99d5f338eaa0c11020db0f4b5e0b 100755 (executable)
--- a/x.ps1
+++ b/x.ps1
@@ -14,6 +14,12 @@ function Get-Application($app) {
     return Get-Command $app -ErrorAction SilentlyContinue -CommandType Application
 }
 
+function Invoke-Application($application, $arguments) {
+    $process = Start-Process -NoNewWindow -PassThru $application $arguments
+    $process.WaitForExit()
+    Exit $process.ExitCode
+}
+
 foreach ($python in "py", "python3", "python", "python2") {
     # NOTE: this only tests that the command exists in PATH, not that it's actually
     # executable. The latter is not possible in a portable way, see
@@ -23,17 +29,14 @@ foreach ($python in "py", "python3", "python", "python2") {
             # Use python3, not python2
             $xpy_args = @("-3") + $xpy_args
         }
-        $process = Start-Process -NoNewWindow -PassThru $python $xpy_args
-        $process.WaitForExit()
-        Exit $process.ExitCode
+        Invoke-Application $python $xpy_args
     }
 }
 
 $found = (Get-Application "python*" | Where-Object {$_.name -match '^python[2-3]\.[0-9]+(\.exe)?$'})
 if (($null -ne $found) -and ($found.Length -ge 1)) {
     $python = $found[0]
-    $process = Start-Process -NoNewWindow -Wait -PassThru $python $xpy_args
-    Exit $process.ExitCode
+    Invoke-Application $python $xpy_args
 }
 
 Write-Error "${PSCommandPath}: error: did not find python installed"