Skip to content

fix(terminal): prefer $SHELL on macOS to avoid bash swallowing cmds (#42203) #42290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kyssta-exe wants to merge 1 commit into from
Closed

fix(terminal): prefer $SHELL on macOS to avoid bash swallowing cmds (#42203) #42290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions tools/environments/local.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import shutil
import signal
import subprocess
import sys
import tempfile
import time
from pathlib import Path
Expand Down Expand Up @@ -239,6 +240,17 @@ def _sanitize_subprocess_env(base_env: dict | None, extra_env: dict | None = Non
def _find_bash() -> str:
"""Find bash for command execution."""
if not _IS_WINDOWS:
# On macOS (Catalina+), zsh is the default shell. Prefer $SHELL over
# the first `which bash` because bash 3.2 (still shipped as
# /bin/bash) silently swallows commands when run as a login shell
# with stdin=/dev/null — ``-l`` triggers ~/.bash_profile sourcing
# which may exec zsh or fail entirely. See issue #42203.
if sys.platform == "darwin":
return (
os.environ.get("SHELL")
or shutil.which("bash")
or "/bin/zsh"
)
return (
shutil.which("bash")
or ("/usr/bin/bash" if os.path.isfile("/usr/bin/bash") else None)
Expand Down
Loading