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

caveats: combine completion and function messages

Browse Source 
Fixes https://github.com/Homebrew/homebrew-core/issues/10338.

Closes #2287.

Signed-off-by: Alex Dunn <dunn.alex@gmail.com>
This commit is contained in:
Alex Dunn 2017-03-07 10:36:57 -08:00
parent 76955b47bd
commit 00af5250f0
2 changed files with 42 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
Library/Homebrew/caveats.rb
View File

@ -16,11 +16,9 @@ class Caveats
f.build = build
end
caveats << keg_only_text
caveats << bash_completion_caveats
caveats << zsh_completion_caveats
caveats << fish_completion_caveats
caveats << zsh_function_caveats
caveats << fish_function_caveats
caveats << function_completion_caveats(:bash)
caveats << function_completion_caveats(:zsh)
caveats << function_completion_caveats(:fish)
caveats << plist_caveats
caveats << python_caveats
caveats << elisp_caveats
@ -72,56 +70,35 @@ class Caveats
s << "\n"
end
def bash_completion_caveats
def function_completion_caveats(shell)
return unless keg
return unless keg.completion_installed?(:bash)
return unless which(shell.to_s)
<<-EOS.undent
Bash completion has been installed to:
#{HOMEBREW_PREFIX}/etc/bash_completion.d
EOS
end
completion_installed = keg.completion_installed?(shell)
functions_installed = keg.functions_installed?(shell)
return unless completion_installed || functions_installed
def zsh_completion_caveats
return unless keg
return unless keg.completion_installed?(:zsh)
installed = []
installed << "completions" if completion_installed
installed << "functions" if functions_installed
<<-EOS.undent
zsh completion has been installed to:
#{HOMEBREW_PREFIX}/share/zsh/site-functions
EOS
end
def fish_completion_caveats
return unless keg
return unless keg.completion_installed?(:fish)
return unless which("fish")
<<-EOS.undent
fish completion has been installed to:
#{HOMEBREW_PREFIX}/share/fish/vendor_completions.d
EOS
end
def zsh_function_caveats
return unless keg
return unless keg.zsh_functions_installed?
<<-EOS.undent
zsh functions have been installed to:
#{HOMEBREW_PREFIX}/share/zsh/site-functions
EOS
end
def fish_function_caveats
return unless keg
return unless keg.fish_functions_installed?
return unless which("fish")
<<-EOS.undent
fish functions have been installed to:
#{HOMEBREW_PREFIX}/share/fish/vendor_functions.d
EOS
case shell
when :bash
<<-EOS.undent
Bash completion has been installed to:
#{HOMEBREW_PREFIX}/etc/bash_completion.d
EOS
when :zsh
<<-EOS.undent
zsh #{installed.join(" and ")} have been installed to:
#{HOMEBREW_PREFIX}/share/zsh/site-functions
EOS
when :fish
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 #{HOMEBREW_PREFIX}/share/fish/vendor_functions.d" if functions_installed
fish_caveats
end
end
def python_caveats

27
Library/Homebrew/keg.rb
View File

@ -302,23 +302,24 @@ class Keg
dir = case shell
when :bash then path.join("etc", "bash_completion.d")
when :zsh
dir = path.join("share", "zsh", "site-functions")
dir if dir && dir.directory? && dir.children.any? { |f| f.basename.to_s.start_with?("_") }
when :fish then path.join("share", "fish", "vendor_completions.d")
dir = path/"share/zsh/site-functions"
dir if dir.directory? && dir.children.any? { |f| f.basename.to_s.start_with?("_") }
when :fish then path/"share/fish/vendor_completions.d"
end
dir && dir.directory? && !dir.children.empty?
end
def zsh_functions_installed?
# Check for non completion functions (i.e. files not started with an underscore),
# since those can be checked separately
dir = path.join("share", "zsh", "site-functions")
dir && dir.directory? && dir.children.any? { |f| !f.basename.to_s.start_with?("_") }
end
def fish_functions_installed?
dir = path.join("share", "fish", "vendor_functions.d")
dir && dir.directory? && !dir.children.empty?
def functions_installed?(shell)
case shell
when :fish
dir = path/"share/fish/vendor_functions.d"
dir.directory? && !dir.children.empty?
when :zsh
# Check for non completion functions (i.e. files not started with an underscore),
# since those can be checked separately
dir = path/"share/zsh/site-functions"
dir.directory? && dir.children.any? { |f| !f.basename.to_s.start_with?("_") }
end
end
def plist_installed?