Skip to content

Commit

Permalink
fix: remove conflicting MISE_SHELL setting
Browse files Browse the repository at this point in the history
Fixes #3280
  • Loading branch information
jdx committed Nov 29, 2024
1 parent 87b11ef commit 8d65fe4
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 16 deletions.
10 changes: 0 additions & 10 deletions settings.toml
Original file line number Diff line number Diff line change
Expand Up @@ -768,16 +768,6 @@ type = "Path"
optional = true
description = "Path to the rustup home directory. Defaults to ~/.rustup or %USERPROFILE%\\.rustup"

[shell]
env = "MISE_SHELL"
type = "String"
optional = true
description = "Sets the shell across all mise commands like `mise run`, `mise en`, and watch files."
docs = """
Sets the shell across all mise commands like `mise run`, `mise en`, and watch files.
This overrides MISE_UNIX_DEFAULT_INLINE_SHELL_ARGS and MISE_WINDOWS_DEFAULT_INLINE_SHELL_ARGS if set.
"""

[shorthands_file]
env = "MISE_SHORTHANDS_FILE"
type = "Path"
Expand Down
2 changes: 1 addition & 1 deletion src/cli/en.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pub struct En {
/// Shell to start
///
/// Defaults to $SHELL
#[clap(verbatim_doc_comment, long, short = 's', env = "MISE_SHELL")]
#[clap(verbatim_doc_comment, long, short = 's')]
pub shell: Option<String>,
}

Expand Down
2 changes: 1 addition & 1 deletion src/cli/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ pub struct Run {
/// Defaults to `sh -c -o errexit -o pipefail` on unix, and `cmd /c` on Windows
/// Can also be set with the setting `MISE_UNIX_DEFAULT_INLINE_SHELL_ARGS` or `MISE_WINDOWS_DEFAULT_INLINE_SHELL_ARGS`
/// Or it can be overridden with the `shell` property on a task.
#[clap(long, short, verbatim_doc_comment, env = "MISE_SHELL")]
#[clap(long, short, verbatim_doc_comment)]
pub shell: Option<String>,

/// Tool(s) to run in addition to what is in mise.toml files
Expand Down
4 changes: 0 additions & 4 deletions src/config/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,6 @@ impl Settings {
if let Some(false) = self.vfox {
self.disable_backends.push("vfox".to_string());
}
if let Some(shell) = &self.shell {
self.unix_default_inline_shell_args = shell.clone();
self.windows_default_inline_shell_args = shell.clone();
}
if let Some(disable_default_shorthands) = self.disable_default_shorthands {
self.disable_default_registry = disable_default_shorthands;
}
Expand Down

0 comments on commit 8d65fe4

Please sign in to comment.