add zsh_home_dir

which return ZDOTDIR if set else HOME

Author: ickc

libmamba/include/mamba/util/environment.hpp

@@ -62,6 +62,14 @@ namespace mamba::util
      */
     [[nodiscard]] auto user_home_dir() -> std::string;
 
+    /**
+     * Return the directory to zsh dotfiles.
+     *
+     * This function checks for the `ZDOTDIR` environment variable and falls back to the user's
+     * home directory if it is not set.
+     */
+    [[nodiscard]] auto zsh_home_dir() -> std::string;
+
     /**
      * Return the current user config directory.
      *

libmamba/src/core/shell_init.cpp

@@ -1259,7 +1259,7 @@ namespace mamba
     {
         init_root_prefix(context, shell, conda_prefix);
         auto mamba_exe = get_self_exe_path();
-        fs::u8path home = util::user_home_dir();
+        fs::u8path home = (shell == "zsh") ? util::zsh_home_dir() : util::user_home_dir();
         if (shell == "bash")
         {
             // On Linux, when opening the terminal, .bashrc is sourced (because it is an interactive
@@ -1275,15 +1275,7 @@ namespace mamba
         }
         else if (shell == "zsh")
         {
-            fs::u8path zshrc_path
-            // use ZDOTDIR if set and fallback to HOME
-            const char* zdotdir = std::getenv("ZDOTDIR");
-            if (zdotdir != nullptr && zdotdir[0] != '\0')
-            {
-                zshrc_path = fs::u8path(zdotdir) / ".zshrc";
-            } else {
-                zshrc_path = home / ".zshrc";
-            }
+            fs::u8path zshrc_path = home / ".zshrc";
             modify_rc_file(context, zshrc_path, conda_prefix, shell, mamba_exe);
         }
         else if (shell == "csh")
@@ -1348,7 +1340,7 @@ namespace mamba
     void deinit_shell(Context& context, const std::string& shell, const fs::u8path& conda_prefix)
     {
         auto mamba_exe = get_self_exe_path();
-        fs::u8path home = util::user_home_dir();
+        fs::u8path home = (shell == "zsh") ? util::zsh_home_dir() : util::user_home_dir();
         if (shell == "bash")
         {
             fs::u8path bashrc_path = (util::on_mac || util::on_win) ? home / ".bash_profile"
@@ -1357,15 +1349,7 @@ namespace mamba
         }
         else if (shell == "zsh")
         {
-            fs::u8path zshrc_path
-            // use ZDOTDIR if set and fallback to HOME
-            const char* zdotdir = std::getenv("ZDOTDIR");
-            if (zdotdir != nullptr && zdotdir[0] != '\0')
-            {
-                zshrc_path = fs::u8path(zdotdir) / ".zshrc";
-            } else {
-                zshrc_path = home / ".zshrc";
-            }
+            fs::u8path zshrc_path = home / ".zshrc";
             reset_rc_file(context, zshrc_path, shell, mamba_exe);
         }
         else if (shell == "xonsh")
@@ -1423,22 +1407,15 @@ namespace mamba
 
     fs::u8path config_path_for_shell(const std::string& shell)
     {
-        fs::u8path home = util::user_home_dir();
+        fs::u8path home = (shell == "zsh") ? util::zsh_home_dir() : util::user_home_dir();
         fs::u8path config_path;
         if (shell == "bash")
         {
             config_path = (util::on_mac || util::on_win) ? home / ".bash_profile" : home / ".bashrc";
         }
         else if (shell == "zsh")
         {
-            // use ZDOTDIR if set and fallback to HOME
-            const char* zdotdir = std::getenv("ZDOTDIR");
-            if (zdotdir != nullptr && zdotdir[0] != '\0')
-            {
-                config_path = fs::u8path(zdotdir) / ".zshrc";
-            } else {
-                config_path = home / ".zshrc";
-            }
+            config_path = home / ".zshrc";
         }
         else if (shell == "xonsh")
         {

libmamba/src/util/environment.cpp

@@ -290,6 +290,15 @@ namespace mamba::util
         throw std::runtime_error("HOME not set.");
     }
 
+    auto zsh_home_dir() -> std::string
+    {
+        if (auto maybe_zdotdir = get_env("ZDOTDIR").value_or(""); !maybe_zdotdir.empty())
+        {
+            return maybe_zdotdir;
+        }
+        return user_home_dir();
+    }
+
     auto user_config_dir() -> std::string
     {
         if (auto maybe_dir = get_env("XDG_CONFIG_HOME").value_or(""); !maybe_dir.empty())