Skip to content

fix(shell) fallback shells #6948

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

Merged
merged 3 commits into from
Nov 20, 2025
+14 −3
Merged

fix(shell) fallback shells #6948

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2562ff3
fix(shell) fallback shells
dylan-hurd-oai Nov 19, 2025
6eee1d1
zsh only on windows
dylan-hurd-oai Nov 20, 2025
603bedb
zsh fallback on linux
dylan-hurd-oai Nov 20, 2025
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
17 changes: 14 additions & 3 deletions codex-rs/core/src/shell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,21 @@ pub async fn default_user_shell() -> Shell {
if cfg!(windows) {
get_shell(ShellType::PowerShell, None).unwrap_or(Shell::Unknown)
} else {
get_user_shell_path()
let user_default_shell = get_user_shell_path()
.and_then(|shell| detect_shell_type(&shell))
.and_then(|shell_type| get_shell(shell_type, None))
.unwrap_or(Shell::Unknown)
.and_then(|shell_type| get_shell(shell_type, None));

let shell_with_fallback = if cfg!(target_os = "macos") {
user_default_shell
.or_else(|| get_shell(ShellType::Zsh, None))
.or_else(|| get_shell(ShellType::Bash, None))
} else {
user_default_shell
.or_else(|| get_shell(ShellType::Bash, None))
.or_else(|| get_shell(ShellType::Zsh, None))
};

shell_with_fallback.unwrap_or(Shell::Unknown)
}
}

Expand Down
Loading