Support for zsh ZDOTDIR, FIX Homebrew#6533

- Add test spec with ZDOTDIR set and unset
davidosomething · Oct 6, 2019 · 960b8b6 · 960b8b6
1 parent fd9a09e
commit 960b8b6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/Library/Homebrew/test/utils/shell_spec.rb b/Library/Homebrew/test/utils/shell_spec.rb
@@ -19,8 +19,15 @@
       expect(subject.profile).to eq("~/.bash_profile")
     end
 
+    it "returns /tmp/.zshrc for Zsh if ZDOTDIR is /tmp" do
+      ENV["SHELL"] = "/bin/zsh"
+      ENV["ZDOTDIR"] = "/tmp"
+      expect(subject.profile).to eq("/tmp/.zshrc")
+    end
+
     it "returns ~/.zshrc for Zsh" do
       ENV["SHELL"] = "/bin/zsh"
+      ENV["ZDOTDIR"] = nil
       expect(subject.profile).to eq("~/.zshrc")
     end
 

diff --git a/Library/Homebrew/utils/shell.rb b/Library/Homebrew/utils/shell.rb
@@ -39,6 +39,7 @@ def export_value(key, value, shell = preferred)
 
     # return the shell profile file based on user's preferred shell
     def profile
+      return ENV.fetch("ZDOTDIR", "~") + "/.zshrc" if preferred.eql? "zsh"
       SHELL_PROFILE_MAP.fetch(preferred, "~/.bash_profile")
     end