Skip to content

Commit

Permalink
fix: remove conflicting MISE_SHELL setting (#3284)
Browse files Browse the repository at this point in the history
* chore: disable some tests on windows

* fix: remove conflicting MISE_SHELL setting

Fixes #3280

* [autofix.ci] apply automated fixes

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
  • Loading branch information
jdx and autofix-ci[bot] authored Nov 29, 2024
1 parent c85e2ec commit 9454d0a
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 20 deletions.
2 changes: 2 additions & 0 deletions registry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ flatc.backends = ["ubi:google/flatbuffers[exe=flatc]", "asdf:TheOpenDictionary/a
flatc.test = ["flatc --version", "flatc version {{version}}"]
flutter.backends = ["asdf:oae/asdf-flutter", "vfox:version-fox/vfox-flutter"]
fluttergen.backends = ["ubi:FlutterGen/flutter_gen[exe=fluttergen]", "asdf:FlutterGen/asdf-fluttergen"]
fluttergen.os = ["linux", "macos"]
fluttergen.test = ["fluttergen --version", "FlutterGen v{{version}}"]
flux2.backends = ["aqua:fluxcd/flux2", "asdf:tablexi/asdf-flux2"]
flux2.test = ["flux --version", "flux version {{version}}"]
Expand All @@ -347,6 +348,7 @@ flyway.backends = ["asdf:junminahn/asdf-flyway"]
func-e.backends = ["tetratelabs/func-e", "asdf:carnei-ro/asdf-func-e"]
func-e.test = ["func-e --version", "func-e version {{version}}"]
furyctl.backends = ["ubi:sighupio/furyctl", "asdf:sighupio/asdf-furyctl"]
furyctl.os = ["linux", "macos"]
furyctl.test = ["furyctl version", "{{version}}"]
fx.backends = ["aqua:antonmedv/fx", "asdf:https://gitlab.com/wt0f/asdf-fx"]
fzf.backends = ["ubi:junegunn/fzf", "asdf:kompiro/asdf-fzf"]
Expand Down
4 changes: 0 additions & 4 deletions schema/mise.json
Original file line number Diff line number Diff line change
Expand Up @@ -594,10 +594,6 @@
}
}
},
"shell": {
"description": "Sets the shell across all mise commands like `mise run`, `mise en`, and watch files.",
"type": "string"
},
"shorthands_file": {
"description": "Path to a file containing custom tool shorthands.",
"type": "string"
Expand Down
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 9454d0a

Please sign in to comment.