Merge pull request #6299 from acasta-yhliu/master

Fix the detection of ZDOTDIR when using zsh
ocaml · Nov 15, 2024 · e687af0 · e687af0
2 parents a19d003 + 27c7639
commit e687af0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/master_changes.md b/master_changes.md
@@ -19,6 +19,7 @@ users)
 ## Plugins
 
 ## Init
+  * [BUG] Fix the detection of `ZDOTDIR` when using `zsh` [#6299 @acasta-yhliu - fix #6281]
 
 ## Config report
 

diff --git a/src/core/opamStd.ml b/src/core/opamStd.ml
@@ -1162,7 +1162,11 @@ module OpamSys = struct
     match shell with
     | SH_fish ->
       Some (List.fold_left Filename.concat (home ".config") ["fish"; "config.fish"])
-    | SH_zsh  -> Some (home ".zshrc")
+    | SH_zsh  ->
+      let zsh_home f = 
+        try Filename.concat (Env.get "ZDOTDIR") f
+        with Not_found -> home f in 
+      Some (zsh_home ".zshrc")
     | SH_bash ->
       let shell =
         (try