fix: path option should take precedence over global configuration

jdx · Jan 28, 2025 · 6b79a23 · 6b79a23
1 parent bc1c4a0
commit 6b79a23
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/cli/use.rs b/src/cli/use.rs
@@ -195,25 +195,25 @@ impl Use {
 
     fn get_config_file(&self) -> Result<Box<dyn ConfigFile>> {
         let cwd = env::current_dir()?;
-        let path = if !env::MISE_ENV.is_empty() {
-            let env = env::MISE_ENV.last().unwrap();
-            config_file_from_dir(&cwd.join(format!("mise.{env}.toml")))
-        } else if self.global || env::in_home_dir() {
-            MISE_GLOBAL_CONFIG_FILE.clone()
+        let path = if let Some(p) = &self.path {
+            let from_dir = config_file_from_dir(p).absolutize()?.to_path_buf();
+            if from_dir.starts_with(&cwd) {
+                from_dir
+            } else {
+                p.clone()
+            }
         } else if let Some(env) = &self.env {
             let p = cwd.join(format!(".mise.{env}.toml"));
             if p.exists() {
                 p
             } else {
                 cwd.join(format!("mise.{env}.toml"))
             }
-        } else if let Some(p) = &self.path {
-            let from_dir = config_file_from_dir(p).absolutize()?.to_path_buf();
-            if from_dir.starts_with(&cwd) {
-                from_dir
-            } else {
-                p.clone()
-            }
+        } else if !env::MISE_ENV.is_empty() {
+            let env = env::MISE_ENV.last().unwrap();
+            config_file_from_dir(&cwd.join(format!("mise.{env}.toml")))
+        } else if self.global || env::in_home_dir() {
+            MISE_GLOBAL_CONFIG_FILE.clone()
         } else {
             config_file_from_dir(&cwd)
         };