From fe1357c9e40282ac5f38fccf517ffc86d726549c Mon Sep 17 00:00:00 2001 From: Risu <79110363+risu729@users.noreply.github.com> Date: Mon, 4 Aug 2025 15:02:21 +1000 Subject: [PATCH 1/4] fix: respect MISE_DEFAULT_CONFIG_FILENAME --- src/cli/config/generate.rs | 5 +++-- src/config/config_file/mod.rs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cli/config/generate.rs b/src/cli/config/generate.rs index 598a1cf471..bfab911fb5 100644 --- a/src/cli/config/generate.rs +++ b/src/cli/config/generate.rs @@ -4,8 +4,8 @@ use clap::ValueHint; use eyre::Result; use crate::config::{Settings, config_file}; -use crate::file; use crate::file::display_path; +use crate::{env, file}; /// [experimental] Generate a mise.toml file #[derive(Debug, clap::Args)] @@ -38,7 +38,8 @@ impl ConfigGenerate { } fn tool_versions(&self, tool_versions: &Path) -> Result { - let to = config_file::parse_or_init(&PathBuf::from("mise.toml"))?; + let to = + config_file::parse_or_init(&PathBuf::from(env::MISE_DEFAULT_CONFIG_FILENAME.clone()))?; let from = config_file::parse(tool_versions)?; let tools = from.to_tool_request_set()?.tools; for (ba, tools) in tools { diff --git a/src/config/config_file/mod.rs b/src/config/config_file/mod.rs index 35cdcbef1e..122fd9b891 100644 --- a/src/config/config_file/mod.rs +++ b/src/config/config_file/mod.rs @@ -231,7 +231,7 @@ fn init(path: &Path) -> Arc { pub fn parse_or_init(path: &Path) -> eyre::Result> { let path = if path.is_dir() { - path.join("mise.toml") + path.join(env::MISE_DEFAULT_CONFIG_FILENAME.clone()) } else { path.into() }; From 557536974ef5b627ad2ce440369580e2516dd4fb Mon Sep 17 00:00:00 2001 From: Risu <79110363+risu729@users.noreply.github.com> Date: Wed, 13 Aug 2025 18:18:17 +1000 Subject: [PATCH 2/4] refactor --- src/cli/config/generate.rs | 2 +- src/config/config_file/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/config/generate.rs b/src/cli/config/generate.rs index bfab911fb5..6329ef206d 100644 --- a/src/cli/config/generate.rs +++ b/src/cli/config/generate.rs @@ -39,7 +39,7 @@ impl ConfigGenerate { fn tool_versions(&self, tool_versions: &Path) -> Result { let to = - config_file::parse_or_init(&PathBuf::from(env::MISE_DEFAULT_CONFIG_FILENAME.clone()))?; + config_file::parse_or_init(&PathBuf::from(&*env::MISE_DEFAULT_CONFIG_FILENAME))?; let from = config_file::parse(tool_versions)?; let tools = from.to_tool_request_set()?.tools; for (ba, tools) in tools { diff --git a/src/config/config_file/mod.rs b/src/config/config_file/mod.rs index 122fd9b891..55d3937b5d 100644 --- a/src/config/config_file/mod.rs +++ b/src/config/config_file/mod.rs @@ -231,7 +231,7 @@ fn init(path: &Path) -> Arc { pub fn parse_or_init(path: &Path) -> eyre::Result> { let path = if path.is_dir() { - path.join(env::MISE_DEFAULT_CONFIG_FILENAME.clone()) + path.join(&*env::MISE_DEFAULT_CONFIG_FILENAME) } else { path.into() }; From 89aa6efe56db44440491937d375d45b87b6fedd8 Mon Sep 17 00:00:00 2001 From: Risu <79110363+risu729@users.noreply.github.com> Date: Wed, 13 Aug 2025 18:23:18 +1000 Subject: [PATCH 3/4] test: add e2e test --- e2e/config/test_config_create_with_filename | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 e2e/config/test_config_create_with_filename diff --git a/e2e/config/test_config_create_with_filename b/e2e/config/test_config_create_with_filename new file mode 100644 index 0000000000..32fabb11c7 --- /dev/null +++ b/e2e/config/test_config_create_with_filename @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +export MISE_DEFAULT_CONFIG_FILENAME=mise.config.toml + +mise use tiny + +assert_contains "mise config" "mise.config.toml" From 6033bc136678150445103a031b38846467915016 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Wed, 13 Aug 2025 08:30:00 +0000 Subject: [PATCH 4/4] [autofix.ci] apply automated fixes --- src/cli/config/generate.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/cli/config/generate.rs b/src/cli/config/generate.rs index 6329ef206d..e5f81db0e2 100644 --- a/src/cli/config/generate.rs +++ b/src/cli/config/generate.rs @@ -38,8 +38,7 @@ impl ConfigGenerate { } fn tool_versions(&self, tool_versions: &Path) -> Result { - let to = - config_file::parse_or_init(&PathBuf::from(&*env::MISE_DEFAULT_CONFIG_FILENAME))?; + let to = config_file::parse_or_init(&PathBuf::from(&*env::MISE_DEFAULT_CONFIG_FILENAME))?; let from = config_file::parse(tool_versions)?; let tools = from.to_tool_request_set()?.tools; for (ba, tools) in tools {