admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #17483 from leoheitmannruiz/patch-1

Browse Source
This commit is contained in:
Mike McQuaid 2024-06-12 16:04:55 +01:00 committed by GitHub
commit dbe03743f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/test/utils/shell_spec.rb
View File

@ -21,13 +21,13 @@ RSpec.describe Utils::Shell do
it "returns /tmp/.zshrc for Zsh if ZDOTDIR is /tmp" do it "returns /tmp/.zshrc for Zsh if ZDOTDIR is /tmp" do
ENV["SHELL"] = "/bin/zsh" ENV["SHELL"] = "/bin/zsh"
ENV["ZDOTDIR"] = "/tmp" ENV["HOMEBREW_ZDOTDIR"] = "/tmp"
expect(described_class.profile).to eq("/tmp/.zshrc") expect(described_class.profile).to eq("/tmp/.zshrc")
end end
it "returns ~/.zshrc for Zsh" do it "returns ~/.zshrc for Zsh" do
ENV["SHELL"] = "/bin/zsh" ENV["SHELL"] = "/bin/zsh"
ENV["ZDOTDIR"] = nil ENV["HOMEBREW_ZDOTDIR"] = nil
expect(described_class.profile).to eq("~/.zshrc") expect(described_class.profile).to eq("~/.zshrc")
end end

2
Library/Homebrew/utils/shell.rb
View File

@ -60,7 +60,7 @@ module Utils
rc_profile = "#{Dir.home}/.rcrc" rc_profile = "#{Dir.home}/.rcrc"
return rc_profile if File.exist? rc_profile return rc_profile if File.exist? rc_profile
when :zsh when :zsh
return "#{ENV["ZDOTDIR"]}/.zshrc" if ENV["ZDOTDIR"].present? return "#{ENV["HOMEBREW_ZDOTDIR"]}/.zshrc" if ENV["HOMEBREW_ZDOTDIR"].present?
end end
SHELL_PROFILE_MAP.fetch(preferred, "~/.profile") SHELL_PROFILE_MAP.fetch(preferred, "~/.profile")

1
bin/brew
View File

@ -180,6 +180,7 @@ USED_BY_HOMEBREW_VARS=(
TMUX TMUX
XDG_CACHE_HOME XDG_CACHE_HOME
XDG_RUNTIME_DIR XDG_RUNTIME_DIR
ZDOTDIR
) )
for VAR in "${USED_BY_HOMEBREW_VARS[@]}" for VAR in "${USED_BY_HOMEBREW_VARS[@]}"
do do