Skip to content

prefer users SHELL #4702

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
michaelneale merged 8 commits into from
Sep 25, 2025
Merged

prefer users SHELL #4702

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
369579b
Don't load user's shell env
jamadeo Sep 19, 2025
b4016c1
Set BASH_ENV in the developer shell
jamadeo Sep 22, 2025
34df5ec
Merge branch 'main' into jackamadeo/dont-load-shell-env
michaelneale Sep 23, 2025
ccb7d95
fmt
michaelneale Sep 23, 2025
6fd5ce1
to comply
michaelneale Sep 23, 2025
26dbf68
prefer users SHELL
michaelneale Sep 23, 2025
12d9fc1
Merge branch 'main' into micn/dont-load-shell-env
michaelneale Sep 24, 2025
7662ea7
Merge branch 'main' into micn/dont-load-shell-env
michaelneale Sep 25, 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
22 changes: 18 additions & 4 deletions crates/goose-mcp/src/developer/shell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,25 @@ impl Default for ShellConfig {
}
#[cfg(not(windows))]
{
let bash_env = get_config_dir().join(".bash_env").into_os_string();
let shell = env::var("SHELL").unwrap_or_else(|_| "bash".to_string());
// Get just the shell name from the path (e.g., /bin/zsh -> zsh)
let shell_name = std::path::Path::new(&shell)
.file_name()
.and_then(|s| s.to_str())
.unwrap_or("bash");

// Configure environment based on shell type
let envs = if shell_name == "bash" {
let bash_env = get_config_dir().join(".bash_env").into_os_string();
vec![(OsString::from("BASH_ENV"), bash_env)]
} else {
vec![]
};

Self {
executable: "bash".to_string(),
args: vec!["-c".to_string()],
envs: vec![(OsString::from("BASH_ENV"), bash_env)],
executable: shell,
args: vec!["-c".to_string()], // -c is standard across bash/zsh/fish
envs,
}
}
}
Expand Down
Loading