Skip to content

Commit 7832302

Browse files
committed
fix(ssh): report a failed home lookup instead of exiting silently
1 parent 669e161 commit 7832302

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

‎packages/ssh/src/tunnel.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ while ! (set -C; printf '%s\\n' "$$" >"$LAUNCH_LOCK") 2>/dev/null; do
626626
done
627627
# Resolve with the new runner before replacing the old one: a failed home
628628
# change must not consume the runner-change signal used for future updates.
629-
DEFAULT_SERVER_HOME="$("$RUNNER_NEXT" __ssh-helper home-dir)"
629+
DEFAULT_SERVER_HOME="$("$RUNNER_NEXT" __ssh-helper home-dir)" || DEFAULT_SERVER_HOME=""
630630
if [ -z "$DEFAULT_SERVER_HOME" ]; then
631631
printf 'Could not resolve the remote T3 home.\\n' >&2
632632
exit 1
@@ -866,7 +866,7 @@ chmod 700 "$RUNNER_FILE"
866866
if [ -f "$STATE_DIR/server-home" ]; then
867867
PAIRING_BASE_DIR="$(cat "$STATE_DIR/server-home")"
868868
else
869-
PAIRING_BASE_DIR="$("$RUNNER_FILE" __ssh-helper home-dir)"
869+
PAIRING_BASE_DIR="$("$RUNNER_FILE" __ssh-helper home-dir)" || PAIRING_BASE_DIR=""
870870
fi
871871
if [ -z "$PAIRING_BASE_DIR" ]; then
872872
printf 'Could not resolve the remote T3 home for pairing.\\n' >&2

0 commit comments

Comments
 (0)