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

caveats: remove ZSH FPATH logic.

Browse Source 
This is too error-prone and full of edge cases.

Fixes #9455
This commit is contained in:
Mike McQuaid 2020-12-09 11:47:48 +00:00
parent 37fe150284
commit 1f8fd2a9ef
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/caveats.rb
View File

@ -128,21 +128,10 @@ class Caveats
#{root_dir}/etc/bash_completion.d #{root_dir}/etc/bash_completion.d
EOS EOS
when :zsh when :zsh
site_functions = root_dir/"share/zsh/site-functions" <<~EOS
zsh_caveats = +<<~EOS
zsh #{installed.join(" and ")} have been installed to: zsh #{installed.join(" and ")} have been installed to:
#{site_functions} #{root_dir}/share/zsh/site-functions
EOS EOS
zsh = which("zsh") || which("zsh", ENV["HOMEBREW_PATH"])
if zsh.present? && Utils.popen_read("'#{zsh}' -ic 'echo $FPATH'").exclude?(site_functions.to_s)
zsh_caveats << <<~EOS
#{site_functions} is not in your zsh FPATH!
Add it by following these steps:
#{Formatter.url("https://docs.brew.sh/Shell-Completion#configuring-completions-in-zsh")}
EOS
end
zsh_caveats.freeze
when :fish when :fish
fish_caveats = +"fish #{installed.join(" and ")} have been installed to:" fish_caveats = +"fish #{installed.join(" and ")} have been installed to:"
fish_caveats << "\n #{root_dir}/share/fish/vendor_completions.d" if completion_installed fish_caveats << "\n #{root_dir}/share/fish/vendor_completions.d" if completion_installed