Skip to content

fix: handle all shells in run_in_environment #2315

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

Open
ritankarsaha wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −2
Open

fix: handle all shells in run_in_environment #2315

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
16 changes: 14 additions & 2 deletions crates/rattler_shell/src/run/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ pub enum RunError {

#[error("IO error: {0}")]
IoError(#[from] std::io::Error),

#[error("Unsupported shell: {0}")]
UnsupportedShell(String),
}

/// Run a subprocess in an activated environment (inherited stdio, `command` non-empty).
Expand Down Expand Up @@ -111,11 +114,20 @@ pub fn run_in_environment(
)?;

match shell {
ShellEnum::Bash(_) => Ok(Command::new(shell.executable()).arg(file.path()).output()?),
ShellEnum::Bash(_)
| ShellEnum::Zsh(_)
| ShellEnum::Fish(_)
| ShellEnum::Xonsh(_)
| ShellEnum::NuShell(_) => {
Ok(Command::new(shell.executable()).arg(file.path()).output()?)
}
ShellEnum::CmdExe(_) => Ok(Command::new(shell.executable())
.arg("/c")
.arg(file.path())
.output()?),
_ => unimplemented!("Unsupported shell: {:?}", shell),
ShellEnum::PowerShell(_) => Ok(Command::new(shell.executable())
.arg("-File")
.arg(file.path())
.output()?),
}
}
Loading