Skip to content

Commit

Permalink
Merge pull request #119 from baszalmstra/fix/run_uses_default_conda_s…
Browse files Browse the repository at this point in the history
…hell

fix: use default shell
  • Loading branch information
ruben-arts authored Jun 20, 2023
2 parents 26119fe + 0ea80c8 commit 159312b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 1 addition & 3 deletions src/cli/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ pub async fn execute(args: Args) -> anyhow::Result<()> {
});

// Determine the current shell
let shell: ShellEnum = ShellEnum::from_env()
.or_else(ShellEnum::from_parent_process)
.unwrap_or_default();
let shell: ShellEnum = ShellEnum::default();

// Construct an activator so we can run commands from the environment
let prefix = get_up_to_date_prefix(&project).await?;
Expand Down
1 change: 1 addition & 0 deletions src/command/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ pub struct ProcessCmd {
pub cmd: CmdArgs,

/// A list of commands that should be run before this one
#[serde(default)]
#[serde_as(deserialize_as = "OneOrMany<_, PreferMany>")]
pub depends_on: Vec<String>,
}
Expand Down

0 comments on commit 159312b

Please sign in to comment.