From bdbeb32a8f3fccfeb75a5a0f0fae802b9996b3df Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 7 May 2025 13:22:49 +1000 Subject: [PATCH] Additional places to look for condarc files --- crates/pet-conda/src/conda_rc.rs | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/crates/pet-conda/src/conda_rc.rs b/crates/pet-conda/src/conda_rc.rs index eb8fdb03..64fa88cd 100644 --- a/crates/pet-conda/src/conda_rc.rs +++ b/crates/pet-conda/src/conda_rc.rs @@ -40,6 +40,12 @@ pub fn get_conda_rc_search_paths(env_vars: &EnvVariables) -> Vec { "C:\\ProgramData\\conda\\.condarc", "C:\\ProgramData\\conda\\condarc", "C:\\ProgramData\\conda\\condarc.d", + "C:\\ProgramData\\miniconda\\.condarc", + "C:\\ProgramData\\miniconda\\condarc", + "C:\\ProgramData\\miniconda\\condarc.d", + "C:\\ProgramData\\miniconda3\\.condarc", + "C:\\ProgramData\\miniconda3\\condarc", + "C:\\ProgramData\\miniconda3\\condarc.d", "C:\\ProgramData\\conda\\.mambarc", format!( "{}:\\ProgramData\\conda\\.condarc", @@ -56,6 +62,36 @@ pub fn get_conda_rc_search_paths(env_vars: &EnvVariables) -> Vec { env::var("SYSTEMDRIVE").unwrap_or("C".to_string()) ) .as_str(), + format!( + "{}:\\ProgramData\\miniconda\\.condarc", + env::var("SYSTEMDRIVE").unwrap_or("C".to_string()) + ) + .as_str(), + format!( + "{}:\\ProgramData\\miniconda\\condarc", + env::var("SYSTEMDRIVE").unwrap_or("C".to_string()) + ) + .as_str(), + format!( + "{}:\\ProgramData\\miniconda\\condarc.d", + env::var("SYSTEMDRIVE").unwrap_or("C".to_string()) + ) + .as_str(), + format!( + "{}:\\ProgramData\\miniconda3\\.condarc", + env::var("SYSTEMDRIVE").unwrap_or("C".to_string()) + ) + .as_str(), + format!( + "{}:\\ProgramData\\miniconda3\\condarc", + env::var("SYSTEMDRIVE").unwrap_or("C".to_string()) + ) + .as_str(), + format!( + "{}:\\ProgramData\\miniconda3\\condarc.d", + env::var("SYSTEMDRIVE").unwrap_or("C".to_string()) + ) + .as_str(), ] .iter() .map(PathBuf::from) @@ -72,6 +108,22 @@ pub fn get_conda_rc_search_paths(env_vars: &EnvVariables) -> Vec { "/var/lib/conda/condarc", "/var/lib/conda/condarc.d", "/var/lib/conda/.mambarc", + "/etc/miniconda/.condarc", + "/etc/miniconda/condarc", + "/etc/miniconda/condarc.d", + "/etc/miniconda/mambarc", + "/var/lib/miniconda/.condarc", + "/var/lib/miniconda/condarc", + "/var/lib/miniconda/condarc.d", + "/var/lib/miniconda/.mambarc", + "/etc/miniconda3/.condarc", + "/etc/miniconda3/condarc", + "/etc/miniconda3/condarc.d", + "/etc/miniconda3/mambarc", + "/var/lib/miniconda3/.condarc", + "/var/lib/miniconda3/condarc", + "/var/lib/miniconda3/condarc.d", + "/var/lib/miniconda3/.mambarc", ] .iter() .map(PathBuf::from)