extract conda dir from the CONDA env variable as well

microsoft · Jun 5, 2024 · 3c1cd10 · 3c1cd10
1 parent 6bed471
commit 3c1cd10
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/crates/pet-conda/src/env_variables.rs b/crates/pet-conda/src/env_variables.rs
@@ -17,6 +17,7 @@ pub struct EnvVariables {
     pub programdata: Option<String>,
     pub homedrive: Option<String>,
     pub conda_root: Option<String>,
+    pub conda: Option<String>,
     pub conda_prefix: Option<String>,
     pub condarc: Option<String>,
     pub xdg_config_home: Option<String>,
@@ -34,6 +35,7 @@ impl EnvVariables {
             programdata: env.get_env_var("PROGRAMDATA".to_string()),
             homedrive: env.get_env_var("HOMEDRIVE".to_string()),
             conda_root: env.get_env_var("CONDA_ROOT".to_string()),
+            conda: env.get_env_var("CONDA".to_string()),
             conda_prefix: env.get_env_var("CONDA_PREFIX".to_string()),
             condarc: env.get_env_var("CONDARC".to_string()),
             xdg_config_home: env.get_env_var("XDG_CONFIG_HOME".to_string()),

diff --git a/crates/pet-conda/src/environment_locations.rs b/crates/pet-conda/src/environment_locations.rs
@@ -193,6 +193,15 @@ pub fn get_known_conda_install_locations(env_vars: &EnvVariables) -> Vec<PathBuf
     if let Some(ref conda_root) = env_vars.conda_root {
         known_paths.push(PathBuf::from(conda_root.clone()));
     }
+    if let Some(ref conda_prefix) = env_vars.conda_prefix {
+        known_paths.push(PathBuf::from(conda_prefix.clone()));
+    }
+    if let Some(ref conda) = env_vars.conda {
+        let conda = PathBuf::from(conda);
+        if let Some(parent) = conda.parent() {
+            known_paths.push(parent.to_path_buf());
+        }
+    }
     if let Some(ref home) = env_vars.home {
         known_paths.push(home.clone().join("anaconda"));
         known_paths.push(home.clone().join("anaconda3"));