This is an automated email from the ASF dual-hosted git repository.

jimjag pushed a commit to branch msys2-dev-prototype
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/msys2-dev-prototype by this 
push:
     new 6efbbe1fe6 Stop the probe from hanging on its Windows-version check
6efbbe1fe6 is described below

commit 6efbbe1fe626b61fe5b06f342d0bbd500d25f954
Author: Jim Jagielski <[email protected]>
AuthorDate: Tue Aug 11 13:34:32 2026 -0400

    Stop the probe from hanging on its Windows-version check
    
    cmd.exe inherits the terminal's stdin under mintty and never returns, which
    strands the run at preflight before any real finding is printed.
---
 msys2-probe.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/msys2-probe.sh b/msys2-probe.sh
index 405b321776..f7b16e567d 100755
--- a/msys2-probe.sh
+++ b/msys2-probe.sh
@@ -136,7 +136,8 @@ else
          "this build mode is x86_64-only; arm64 Windows is deferred" CRITICAL
 fi
 
-WINVER="$(cmd.exe /c ver 2>/dev/null | tr -d '\r' | grep -o '[0-9][0-9.]*' | 
head -1)"
+# Native console program under a pty: detach stdin and cap it, or it deadlocks.
+WINVER="$(timeout 5 cmd.exe /c ver </dev/null 2>/dev/null | tr -d '\r' | grep 
-o '[0-9][0-9.]*' | head -1)"
 info "Windows version" "${WINVER:-unknown}"
 
 # ----------------------------------------------------------------- packages --

Reply via email to