Merge pull request #1616 from zachwhaley/zsh_functions_caveats

caveats: Differentiate zsh completion files and function files

1 files changed, 10 insertions, 1 deletions

diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index 0dfad1a42..1de4ce1f0 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -297,12 +297,21 @@ class Keg
   def completion_installed?(shell)
     dir = case shell
     when :bash then path.join("etc", "bash_completion.d")
-    when :zsh  then path.join("share", "zsh", "site-functions")
+    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")
     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?