Skip to content

fix: shell wrapper overwrites $SHELL #601

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 1 commit into from
Dec 8, 2024
Merged

fix: shell wrapper overwrites $SHELL #601

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
5 changes: 4 additions & 1 deletion utils/src/shell_wrapper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ fn real_main() -> anyhow::Result<()> {
let shell = read_link(exe_dir.join("shell")).context("when locating the wrapped shell")?;

// Set the SHELL environment variable to the wrapped shell instead of the wrapper
env::set_var("SHELL", &shell);
let shell_env = env::var_os("SHELL");
if shell_env == Some(exe.into()) {
env::set_var("SHELL", &shell);
}

// Skip if environment was already set
if env::var_os("__NIXOS_SET_ENVIRONMENT_DONE") != Some("1".into()) {
Expand Down
Loading