X-Git-Url: https://vilimpoc.org/repos/dotfiles/blobdiff_plain/f51da37a77ac790110def9697b57f49b821c4c75..4658d6d:/setup-windows-with-uac.ps1?ds=inline

diff --git a/setup-windows-with-uac.ps1 b/setup-windows-with-uac.ps1
index a11e175..4b7ea94 100644
--- a/setup-windows-with-uac.ps1
+++ b/setup-windows-with-uac.ps1
@@ -436,13 +436,26 @@ try {
     # $global:LASTEXITCODE is cleared first because an exe that cannot start at
     # all throws without setting one, and the stale 0 from the previous native
     # command would otherwise read as success.
+    #
+    # DRAIN THE OUTPUT BEFORE READING $LASTEXITCODE. `... | Select-Object -First 1`
+    # was the original spelling here, and it is a trap: Select-Object stops the
+    # pipeline the instant it has its one object, and that is when ssh.exe has
+    # WRITTEN its banner - not when it has exited. PowerShell then tears the
+    # pipeline down, kills the still-running process, and reports -1. Measured on a
+    # healthy binary on an x64 box: 24 of 25 runs reported exit -1 through
+    # Select-Object, and 25 of 25 reported 0 when the output was collected first.
+    #
+    # So this check was deleting a perfectly good ssh.exe on almost every run, on
+    # every architecture, and the resulting fallback to the in-box client - the
+    # ~17MB/s one this whole step exists to avoid - looked like a property of the
+    # release rather than a bug in the test. Collect, THEN take the first line.
     $SshExe = Join-Path $RsyncDir 'ssh.exe'
     if ($WantSsh -and (Test-Path $SshExe)) {
         $prevEap = $ErrorActionPreference
         $ErrorActionPreference = 'Continue'
         $global:LASTEXITCODE = $null
         $sshVer = $null
-        try { $sshVer = (& $SshExe -V 2>&1 | Select-Object -First 1) } catch { }
+        try { $sshOut = (& $SshExe -V 2>&1); $sshVer = $sshOut | Select-Object -First 1 } catch { }
         finally { $ErrorActionPreference = $prevEap }
         if ($LASTEXITCODE -eq 0) {
             Write-Host "    ssh.exe runs: $sshVer"