use ZDOTDIR if set and fallback to HOME

ickc · ickc · commit fbbee9f43078 · 2025-05-12T18:59:40.000+01:00
diff --git a/libmamba/src/core/shell_init.cpp b/libmamba/src/core/shell_init.cpp
@@ -1274,7 +1274,15 @@ namespace mamba
         }
         else if (shell == "zsh")
         {
-            fs::u8path zshrc_path = home / ".zshrc";
+            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";
+            }
             modify_rc_file(context, zshrc_path, conda_prefix, shell, mamba_exe);
         }
         else if (shell == "csh")
@@ -1348,7 +1356,15 @@ namespace mamba
         }
         else if (shell == "zsh")
         {
-            fs::u8path zshrc_path = home / ".zshrc";
+            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";
+            }
             reset_rc_file(context, zshrc_path, shell, mamba_exe);
         }
         else if (shell == "xonsh")
@@ -1414,7 +1430,14 @@ namespace mamba
         }
         else if (shell == "zsh")
         {
-            config_path = home / ".zshrc";
+            // 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";
+            }
         }
         else if (shell == "xonsh")
         {

Original file line number	Diff line number	Diff line change
`@@ -1274,7 +1274,15 @@ namespace mamba`
`1274`	`1274`	`}`
`1275`	`1275`	`else if (shell == "zsh")`
`1276`	`1276`	`{`
`1277`		`- fs::u8path zshrc_path = home / ".zshrc";`
	`1277`	`+ fs::u8path zshrc_path`
	`1278`	`+ // use ZDOTDIR if set and fallback to HOME`
	`1279`	`+ const char* zdotdir = std::getenv("ZDOTDIR");`
	`1280`	`+ if (zdotdir != nullptr && zdotdir[0] != '\0')`
	`1281`	`+ {`
	`1282`	`+ zshrc_path = fs::u8path(zdotdir) / ".zshrc";`
	`1283`	`+ } else {`
	`1284`	`+ zshrc_path = home / ".zshrc";`
	`1285`	`+ }`
`1278`	`1286`	`modify_rc_file(context, zshrc_path, conda_prefix, shell, mamba_exe);`
`1279`	`1287`	`}`
`1280`	`1288`	`else if (shell == "csh")`
`@@ -1348,7 +1356,15 @@ namespace mamba`
`1348`	`1356`	`}`
`1349`	`1357`	`else if (shell == "zsh")`
`1350`	`1358`	`{`
`1351`		`- fs::u8path zshrc_path = home / ".zshrc";`
	`1359`	`+ fs::u8path zshrc_path`
	`1360`	`+ // use ZDOTDIR if set and fallback to HOME`
	`1361`	`+ const char* zdotdir = std::getenv("ZDOTDIR");`
	`1362`	`+ if (zdotdir != nullptr && zdotdir[0] != '\0')`
	`1363`	`+ {`
	`1364`	`+ zshrc_path = fs::u8path(zdotdir) / ".zshrc";`
	`1365`	`+ } else {`
	`1366`	`+ zshrc_path = home / ".zshrc";`
	`1367`	`+ }`
`1352`	`1368`	`reset_rc_file(context, zshrc_path, shell, mamba_exe);`
`1353`	`1369`	`}`
`1354`	`1370`	`else if (shell == "xonsh")`
`@@ -1414,7 +1430,14 @@ namespace mamba`
`1414`	`1430`	`}`
`1415`	`1431`	`else if (shell == "zsh")`
`1416`	`1432`	`{`
`1417`		`- config_path = home / ".zshrc";`
	`1433`	`+ // use ZDOTDIR if set and fallback to HOME`
	`1434`	`+ const char* zdotdir = std::getenv("ZDOTDIR");`
	`1435`	`+ if (zdotdir != nullptr && zdotdir[0] != '\0')`
	`1436`	`+ {`
	`1437`	`+ config_path = fs::u8path(zdotdir) / ".zshrc";`
	`1438`	`+ } else {`
	`1439`	`+ config_path = home / ".zshrc";`
	`1440`	`+ }`
`1418`	`1441`	`}`
`1419`	`1442`	`else if (shell == "xonsh")`
`1420`	`1443`	`{`