fix: Activated environment name

Signed-off-by: Julien Jerphanion <[email protected]>
mamba-org · Dec 9, 2024 · 0cd5a53 · 0cd5a53
1 parent 1785933
commit 0cd5a53
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/libmamba/src/core/activation.cpp b/libmamba/src/core/activation.cpp
@@ -56,10 +56,10 @@ namespace mamba
         {
             return "base";
         }
-        // if ../miniconda3/envs/my_super_env, return `my_super_env`, else path
-        if (prefix.parent_path().stem() == "envs")
+        // if ../miniconda3/envs/my_super.env, return `my_super.env`, else path
+        if (prefix.parent_path().filename() == "envs")
         {
-            return prefix.stem().string();
+            return prefix.filename().string();
         }
         else
         {

diff --git a/libmamba/tests/src/core/test_activation.cpp b/libmamba/tests/src/core/test_activation.cpp
@@ -16,5 +16,20 @@ namespace mamba
             // std::endl; std::cout << a.activate("/home/wolfv/miniconda3/", false) <<
             // std::endl;
         }
+
+        TEST_CASE("Activator::get_default_env")
+        {
+            ContextOptions opts;
+            Context ctx(opts);
+            ctx.prefix_params.root_prefix = "/home/user/miniforge";
+            PosixActivator a(ctx);
+            REQUIRE(a.get_default_env("/home/user/miniforge") == "base");
+            REQUIRE(a.get_default_env("/home/user/miniforge/envs/env") == "env");
+            REQUIRE(a.get_default_env("/home/user/miniforge/envs/an.env") == "an.env");
+            REQUIRE(a.get_default_env("/home/user/miniforge/envs/an-oth.er") == "an-oth.er");
+            REQUIRE(a.get_default_env("/opt/envs/yet.an-oth.er") == "yet.an-oth.er");
+            REQUIRE(a.get_default_env("/opt/envs.d/env") == "/opt/envs.d/env");
+            REQUIRE(a.get_default_env("/home/user/some/env") == "/home/user/some/env");
+        }
     }
 }  // namespace mamba