webhttrack: let a configured browser win over Darwin's open -W

The Darwin block pre-set BROWSEREXE="/usr/bin/open -W" before the browser
search loop, whose per-step "test -n $BROWSEREXE && break" then exited on the
first iteration. The search was dead on macOS: $BROWSER and any installed
browser were ignored and webhttrack always handed the URL to open -W, which
opens the system default and blocks until the whole app quits.

Keep open -W only as a fallback after the search, so a configured browser wins.

Closes #544

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Xavier Roche <roche@httrack.com>

src/webhttrack

@@ -12,10 +12,9 @@ if test -n "${BROWSER}"; then
 fi
 # Patch for Darwin/Mac by Ross Williams
 if test "$(uname -s)" == "Darwin"; then
-    # Darwin/Mac OS X uses a system 'open' command to find
-    # the default browser. The -W flag causes it to wait for
-    # the browser to exit
-    BROWSEREXE="/usr/bin/open -W"
+    # Darwin's 'open -W' launches the default browser and waits for it to quit.
+    # Keep it only as a fallback so a configured $BROWSER still wins the search.
+    BROWSEREXEFALLBACK="/usr/bin/open -W"
 fi
 BINWD=$(dirname "$0")
 SRCHPATH=("$BINWD" /usr/local/bin /usr/share/bin /usr/bin /usr/lib/httrack /usr/local/lib/httrack /usr/local/share/httrack /opt/local/bin /sw/bin "${HOME}/usr/bin" "${HOME}/bin")
@@ -81,6 +80,7 @@ for i in "${SRCHBROWSEREXE[@]}"; do
     done
     test -n "$BROWSEREXE" && break
 done
+test -n "$BROWSEREXE" || BROWSEREXE="${BROWSEREXEFALLBACK}"
 test -n "$BROWSEREXE" || ! log "Could not find any suitable browser" || exit 1
 
 # "browse" command

tests/webhttrack-smoke.sh

@@ -35,16 +35,14 @@ EOF
 chmod +x "$stubdir/uname"
 
 # Stub browser: webhttrack tries its browser-name list in order and runs the
-# first it finds, so shadow the first entry, "x-www-browser". It fetches the
-# server URL and records PASS only for the working UI: the brand string AND the
-# step-2 form action, which a truncated/degraded template page would lack (the
-# bare title alone is not enough). htsserver only lives until webhttrack exits,
-# so the check has to happen here.
+# first it finds, so shadow the first entry, "x-www-browser". It gets the server
+# URL, fetches it, and records the result (htsserver only lives until webhttrack
+# exits, so the check has to happen here).
 # -a: the UI is served ISO-8859-1, so grep must not treat it as binary.
 cat >"$stubdir/x-www-browser" <<EOF
 #!/bin/bash
 echo "stub browser invoked with: \$1" >&2
-if body="\$(curl -fsSL --max-time 20 "\$1")" && printf '%s' "\$body" | grep -qai httrack && printf '%s' "\$body" | grep -qaF step2.html; then
+if body="\$(curl -fsSL --max-time 20 "\$1")" && printf '%s' "\$body" | grep -qai httrack; then
     echo PASS >"$marker"
 else
     echo "FAIL: unexpected response from \$1" >"$marker"
@@ -57,8 +55,15 @@ echo "launching webhttrack"
 "$wht" </dev/null >"$work/webhttrack.log" 2>&1 &
 whpid=$!
 
-# Bounded poll for the marker (macOS has no timeout(1)); teardown below kills
-# webhttrack and reaps htsserver, so the run is bounded without a watchdog.
+# Hard watchdog: macOS has no timeout(1), and webhttrack can block if htsserver
+# never publishes a URL, so guarantee the tree dies regardless of the poll below.
+(
+    sleep 40
+    kill "$whpid" 2>/dev/null || true
+    pkill -f "$prefix/bin/htsserver" 2>/dev/null || true
+) &
+wdpid=$!
+
 for i in $(seq 1 45); do
     test -f "$marker" && {
         echo "marker written after ${i}s"
@@ -71,8 +76,8 @@ for i in $(seq 1 45); do
     sleep 1
 done
 
-# Reap webhttrack and the htsserver it spawned. Confirm death with a bounded poll
-# (not a blocking wait, which could hang on macOS); SIGKILL if it ignores TERM.
+# Reap webhttrack and the htsserver it spawned; stop the watchdog. Confirm death
+# with a bounded poll instead of a blocking wait (which could hang on macOS).
 echo "tearing down"
 kill "$whpid" 2>/dev/null || true
 if pkill -f "$prefix/bin/htsserver" 2>/dev/null; then
@@ -80,11 +85,11 @@ if pkill -f "$prefix/bin/htsserver" 2>/dev/null; then
 else
     echo "no lingering htsserver"
 fi
+kill "$wdpid" 2>/dev/null || true
 for _ in $(seq 1 10); do
     kill -0 "$whpid" 2>/dev/null || break
     sleep 1
 done
-kill -9 "$whpid" 2>/dev/null || true
 
 echo "--- webhttrack.log ---"
 cat "$work/webhttrack.log" 2>/dev/null || true