Automatically append shell completion caveats

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

13 files changed, 3 insertions, 99 deletions

diff --git a/Library/Formula/ack.rb b/Library/Formula/ack.rb
index 38a365450..dc8d49277 100644
--- a/Library/Formula/ack.rb
+++ b/Library/Formula/ack.rb
@@ -12,13 +12,4 @@ class Ack < Formula
     (prefix+'etc/bash_completion.d').install 'etc/ack.bash_completion.sh'
     (share+'zsh/site-functions').install 'etc/ack.zsh_completion' => '_ack'
   end
-
-  def caveats; <<-EOS.undent
-    Bash completion has been installed to:
-      #{etc}/bash_completion.d
-
-    zsh completion has been installed to:
-      #{HOMEBREW_PREFIX}/share/zsh/site-functions
-    EOS
-  end
 end
diff --git a/Library/Formula/autojump.rb b/Library/Formula/autojump.rb
index 3eed705fe..988b607cc 100644
--- a/Library/Formula/autojump.rb
+++ b/Library/Formula/autojump.rb
@@ -23,9 +23,6 @@ class Autojump < Formula
     if [ -f `brew --prefix`/etc/autojump ]; then
       . `brew --prefix`/etc/autojump
     fi
-
-    zsh completion has been installed to:
-      #{HOMEBREW_PREFIX}/share/zsh/site-functions
     EOS
   end
 end
diff --git a/Library/Formula/cdargs.rb b/Library/Formula/cdargs.rb
index a54bc8ba6..3d0b94072 100644
--- a/Library/Formula/cdargs.rb
+++ b/Library/Formula/cdargs.rb
@@ -28,17 +28,8 @@ class Cdargs < Formula
   end
 
   def caveats; <<-EOS.undent
-      Support files for bash, tcsh and emacs are located in:
+      Support files for bash, tcsh, and emacs have been installed to:
         #{prefix}/contrib
-
-      The file for bash is also symlinked to:
-        #{etc}/bash_completion.d/cdargs-bash.sh
-
-      Source it from your .bash_profile or .bashrc to get nice aliases and bash completion.
-
-      For zsh use the bash script.
-
-      Consult the cdargs man page for more details and instructions.
     EOS
   end
 end
diff --git a/Library/Formula/git-flow.rb b/Library/Formula/git-flow.rb
index e04dd6496..39627d08e 100644
--- a/Library/Formula/git-flow.rb
+++ b/Library/Formula/git-flow.rb
@@ -25,13 +25,4 @@ class GitFlow < Formula
       (share+'zsh/site-functions').install "git-flow-completion.zsh"
     end
   end
-
-  def caveats; <<-EOS.undent
-    Bash completion has been installed to:
-      #{etc}/bash_completion.d
-
-    zsh completion has been installed to:
-      #{HOMEBREW_PREFIX}/share/zsh/site-functions
-    EOS
-  end
 end
diff --git a/Library/Formula/git-now.rb b/Library/Formula/git-now.rb
index c1fcda3cf..ce831cea4 100644
--- a/Library/Formula/git-now.rb
+++ b/Library/Formula/git-now.rb
@@ -17,12 +17,6 @@ class GitNow < Formula
     system "make", "prefix=#{prefix}", "install"
     (share+'zsh/site-functions').install 'etc/_git-now'
   end
-
-  def caveats; <<-EOS.undent
-   Zsh completion has been installed to:
-      #{HOMEBREW_PREFIX}/share/zsh/site-functions
-    EOS
-  end
 end
 
 # This patch makes sure GNUtools are used on OSX.
diff --git a/Library/Formula/git.rb b/Library/Formula/git.rb
index bfd7cdd35..d48ce2ddf 100644
--- a/Library/Formula/git.rb
+++ b/Library/Formula/git.rb
@@ -72,9 +72,6 @@ class Git < Formula
   end
 
   def caveats; <<-EOS.undent
-    Bash completion has been installed to:
-      #{etc}/bash_completion.d
-
     The OS X keychain credential helper has been installed to:
       #{HOMEBREW_PREFIX}/bin/git-credential-osxkeychain
 
diff --git a/Library/Formula/hub.rb b/Library/Formula/hub.rb
index 0e68048e5..731090d24 100644
--- a/Library/Formula/hub.rb
+++ b/Library/Formula/hub.rb
@@ -22,13 +22,4 @@ class Hub < Formula
       '/usr/bin/rake'
     end
   end
-
-  def caveats; <<-EOS.undent
-    Bash completion has been installed to:
-      #{etc}/bash_completion.d
-
-    zsh completion has been installed to:
-      #{HOMEBREW_PREFIX}/share/zsh/site-functions
-    EOS
-  end
 end
diff --git a/Library/Formula/savana.rb b/Library/Formula/savana.rb
index 40d57fcc7..5c50b2987 100644
--- a/Library/Formula/savana.rb
+++ b/Library/Formula/savana.rb
@@ -18,13 +18,6 @@ class Savana < Formula
       exec "#{libexec}/bin/sav" "$@"
     EOS
 
-    # Install the Savana bash completion file, renaming it to be specific to savana.
     (prefix+'etc/bash_completion.d').install 'etc/bash_completion' => 'savana-completion.bash'
   end
-
-  def caveats; <<-EOS.undent
-    Bash completion has been installed to:
-      #{etc}/bash_completion.d
-    EOS
-  end
 end
diff --git a/Library/Formula/scala.rb b/Library/Formula/scala.rb
index 8c7cacc6d..8bb7bfdf0 100644
--- a/Library/Formula/scala.rb
+++ b/Library/Formula/scala.rb
@@ -31,10 +31,4 @@ class Scala < Formula
     ScalaCompletion.new.brew { (prefix+'etc/bash_completion.d').install 'scala' }
     ScalaDocs.new.brew { doc.install Dir['*'] } if ARGV.include? '--with-docs'
   end
-
-  def caveats; <<-EOS.undent
-    Bash completion has been installed to:
-      #{etc}/bash_completion.d
-    EOS
-  end
 end
diff --git a/Library/Formula/task.rb b/Library/Formula/task.rb
index 99caab2a1..d16a9c9e7 100644
--- a/Library/Formula/task.rb
+++ b/Library/Formula/task.rb
@@ -15,13 +15,4 @@ class Task < Formula
     (etc+'bash_completion.d').install 'scripts/bash/task.sh'
     (share+'zsh/site-functions').install   'scripts/zsh/_task'
   end
-
-  def caveats; <<-EOS.undent
-    Bash completion has been installed to:
-      #{etc}/bash_completion.d
-
-    zsh completion has been installed to:
-      #{HOMEBREW_PREFIX}/share/zsh/site-functions
-    EOS
-  end
 end
diff --git a/Library/Formula/tmux.rb b/Library/Formula/tmux.rb
index 5f2945d8a..8d5a2aaa5 100644
--- a/Library/Formula/tmux.rb
+++ b/Library/Formula/tmux.rb
@@ -31,22 +31,12 @@ class Tmux < Formula
                           "--prefix=#{prefix}", "--sysconfdir=#{etc}"
     system "make install"
 
-    # Install bash completion scripts for use with bash-completion
     (prefix+'etc/bash_completion.d').install "examples/bash_completion_tmux.sh" => 'tmux'
 
     # Install addtional meta file
     prefix.install 'NOTES'
   end
 
-  def caveats; <<-EOS.undent
-    Additional information can be found in:
-      #{prefix}/NOTES
-
-    Bash completion script was installed to:
-      #{etc}/bash_completion.d/tmux
-    EOS
-  end
-
   def test
     system "#{bin}/tmux", "-V"
   end
diff --git a/Library/Formula/todo-txt.rb b/Library/Formula/todo-txt.rb
index 1da9d8324..32afb33d1 100644
--- a/Library/Formula/todo-txt.rb
+++ b/Library/Formula/todo-txt.rb
@@ -12,13 +12,4 @@ class TodoTxt < Formula
     prefix.install 'todo.cfg' # Default config file
     (prefix+'etc/bash_completion.d').install 'todo_completion'
   end
-
-  def caveats; <<-EOS.undent
-    To configure, copy the default config to your home and edit it:
-      cp #{prefix}/todo.cfg ~/.todo.cfg
-
-    Bash completion has been installed to:
-      #{etc}/bash_completion.d
-    EOS
-  end
 end
diff --git a/Library/Formula/wp-cli.rb b/Library/Formula/wp-cli.rb
index 438df33b9..d67ae3a0c 100644
--- a/Library/Formula/wp-cli.rb
+++ b/Library/Formula/wp-cli.rb
@@ -10,15 +10,8 @@ class WpCli < Formula
   head 'https://github.com/wp-cli/wp-cli.git'
 
   def install
-      prefix.install Dir['src/*']
-      # Install bash completion scripts for use with bash-completion
-      (prefix+'etc/bash_completion.d').install 'utils/wp-completion.bash' => 'wp'
-  end
-
-  def caveats; <<-EOS.undent
-    Bash completion script was installed to:
-      #{etc}/bash_completion.d/wp
-    EOS
+    prefix.install Dir['src/*']
+    (prefix+'etc/bash_completion.d').install 'utils/wp-completion.bash' => 'wp'
   end
 
   def test