Merge branch 'main' into nushell

mamba-org · Aug 28, 2023 · fca3e69 · fca3e69
2 parents e616dfb + 65c061f
commit fca3e69
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/libmamba/include/mamba/core/mamba_fs.hpp b/libmamba/include/mamba/core/mamba_fs.hpp
@@ -335,6 +335,12 @@ namespace fs
             return this->wstring();
         }
 
+        // Returns an utf-8 string using the ``/`` on all systems.
+        std::string generic_string() const
+        {
+            return to_utf8(m_path.generic_string());
+        }
+
         // Implicit conversion to standard path.
         operator std::filesystem::path() const
         {

diff --git a/libmamba/src/core/shell_init.cpp b/libmamba/src/core/shell_init.cpp
@@ -568,19 +568,22 @@ namespace mamba
         if (shell == "zsh" || shell == "bash" || shell == "posix")
         {
             std::string contents = data_micromamba_sh;
-            util::replace_all(contents, "$MAMBA_EXE", exe.string());
+            // Using /unix/like/paths on Unix shell (even on Windows)
+            util::replace_all(contents, "$MAMBA_EXE", exe.generic_string());
             return contents;
         }
         else if (shell == "csh")
         {
             std::string contents = data_micromamba_csh;
-            util::replace_all(contents, "$MAMBA_EXE", exe.string());
+            // Using /unix/like/paths on Unix shell (even on Windows)
+            util::replace_all(contents, "$MAMBA_EXE", exe.generic_string());
             return contents;
         }
         else if (shell == "xonsh")
         {
             std::string contents = data_mamba_xsh;
-            util::replace_all(contents, "$MAMBA_EXE", exe.string());
+            // Using /unix/like/paths on Unix shell (even on Windows)
+            util::replace_all(contents, "$MAMBA_EXE", exe.generic_string());
             return contents;
         }
         else if (shell == "powershell")
@@ -606,7 +609,8 @@ namespace mamba
         else if (shell == "fish")
         {
             std::string contents = data_mamba_fish;
-            util::replace_all(contents, "$MAMBA_EXE", exe.string());
+            // Using /unix/like/paths on Unix shell (even on Windows)
+            util::replace_all(contents, "$MAMBA_EXE", exe.generic_string());
             return contents;
         }
         // deprecated according to https://github.com/mamba-org/mamba/pull/2693