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

Merge pull request #3590 from DomT4/completions_are_not_always_linked

Browse Source 
caveats: correct completion/function paths for keg_only
This commit is contained in:
Mike McQuaid 2017-12-24 20:40:52 +00:00 committed by GitHub
commit 2259e369ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/caveats.rb
View File

@ -86,21 +86,23 @@ class Caveats
installed << "completions" if completion_installed installed << "completions" if completion_installed
installed << "functions" if functions_installed installed << "functions" if functions_installed
root_dir = f.keg_only? ? f.opt_prefix : HOMEBREW_PREFIX
case shell case shell
when :bash when :bash
<<~EOS <<~EOS
Bash completion has been installed to: Bash completion has been installed to:
#{HOMEBREW_PREFIX}/etc/bash_completion.d #{root_dir}/etc/bash_completion.d
EOS EOS
when :zsh when :zsh
<<~EOS <<~EOS
zsh #{installed.join(" and ")} have been installed to: zsh #{installed.join(" and ")} have been installed to:
#{HOMEBREW_PREFIX}/share/zsh/site-functions #{root_dir}/share/zsh/site-functions
EOS EOS
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 #{HOMEBREW_PREFIX}/share/fish/vendor_completions.d" if completion_installed fish_caveats << "\n #{root_dir}/share/fish/vendor_completions.d" if completion_installed
fish_caveats << "\n #{HOMEBREW_PREFIX}/share/fish/vendor_functions.d" if functions_installed fish_caveats << "\n #{root_dir}/share/fish/vendor_functions.d" if functions_installed
fish_caveats fish_caveats
end end
end end