From 9454d0a0c94f89939c0865b8f3f2724b90023abd Mon Sep 17 00:00:00 2001
From: jdx <216188+jdx@users.noreply.github.com>
Date: Fri, 29 Nov 2024 03:19:29 -0600
Subject: [PATCH] fix: remove conflicting MISE_SHELL setting (#3284)

* 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>
---
 registry.toml          |  2 ++
 schema/mise.json       |  4 ----
 settings.toml          | 10 ----------
 src/cli/en.rs          |  2 +-
 src/cli/run.rs         |  2 +-
 src/config/settings.rs |  4 ----
 6 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/registry.toml b/registry.toml
index 379b8d8cf2..29e2d285b0 100644
--- a/registry.toml
+++ b/registry.toml
@@ -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}}"]
@@ -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"]
diff --git a/schema/mise.json b/schema/mise.json
index 31eaa0bfd3..2065b8e9ef 100644
--- a/schema/mise.json
+++ b/schema/mise.json
@@ -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"
diff --git a/settings.toml b/settings.toml
index 7a079c8cca..677dcfd90e 100644
--- a/settings.toml
+++ b/settings.toml
@@ -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"
diff --git a/src/cli/en.rs b/src/cli/en.rs
index 035df1d7b8..7282ec0508 100644
--- a/src/cli/en.rs
+++ b/src/cli/en.rs
@@ -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>,
 }
 
diff --git a/src/cli/run.rs b/src/cli/run.rs
index 7fda881e20..caaffc3622 100644
--- a/src/cli/run.rs
+++ b/src/cli/run.rs
@@ -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
diff --git a/src/config/settings.rs b/src/config/settings.rs
index 9a3c36f05b..64d83be7e2 100644
--- a/src/config/settings.rs
+++ b/src/config/settings.rs
@@ -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;
         }