24 files changed, 29 insertions, 35 deletions
diff --git a/Library/Formula/android-sdk.rb b/Library/Formula/android-sdk.rb
index 468c90744..2833d342c 100644
--- a/Library/Formula/android-sdk.rb
+++ b/Library/Formula/android-sdk.rb
@@ -53,7 +53,7 @@ class AndroidSdk < Formula
     end
 
     AdbBashCompletion.new.brew do
-      (prefix+'etc/bash_completion.d').install 'adb.bash' => 'adb-completion.bash'
+      bash_completion.install 'adb.bash' => 'adb-completion.bash'
     end
   end
 
diff --git a/Library/Formula/cabal-install.rb b/Library/Formula/cabal-install.rb
index 918f10e7f..fab629eee 100644
--- a/Library/Formula/cabal-install.rb
+++ b/Library/Formula/cabal-install.rb
@@ -11,7 +11,6 @@ class CabalInstall < Formula
     ENV['PREFIX'] = "#{prefix}"
     ENV['VERBOSE'] = ''
     system "sh bootstrap.sh"
-
-    (prefix+'etc/bash_completion.d').install 'bash-completion/cabal'
+    bash_completion.install 'bash-completion/cabal'
   end
 end
diff --git a/Library/Formula/cdargs.rb b/Library/Formula/cdargs.rb
index 96b29aedf..2c2fcc92c 100644
--- a/Library/Formula/cdargs.rb
+++ b/Library/Formula/cdargs.rb
@@ -23,8 +23,7 @@ class Cdargs < Formula
 
     rm Dir['contrib/Makefile*']
     prefix.install 'contrib'
-
-    (etc+'bash_completion.d').install_symlink prefix+'contrib/cdargs-bash.sh'
+    bash_completion.install_symlink "#{prefix}/contrib/cdargs-bash.sh"
   end
 
   def caveats; <<-EOS.undent
diff --git a/Library/Formula/gibo.rb b/Library/Formula/gibo.rb
index 1dd0634ff..abd7a9cef 100644
--- a/Library/Formula/gibo.rb
+++ b/Library/Formula/gibo.rb
@@ -7,7 +7,7 @@ class Gibo < Formula
 
   def install
     bin.install "gibo"
-    (prefix/'etc/bash_completion.d').install 'gibo-completion.bash'
-    (share/'zsh/site-functions').install 'gibo-completion.zsh' => '_gibo'
+    bash_completion.install 'gibo-completion.bash'
+    zsh_completion.install 'gibo-completion.zsh' => '_gibo'
   end
 end
diff --git a/Library/Formula/git-flow-avh.rb b/Library/Formula/git-flow-avh.rb
index 9f682f469..71a401612 100644
--- a/Library/Formula/git-flow-avh.rb
+++ b/Library/Formula/git-flow-avh.rb
@@ -23,8 +23,8 @@ class GitFlowAvh < Formula
     system "make", "prefix=#{prefix}", "install"
 
     GitFlowAvhCompletion.new('git-flow-avh-completion').brew do
-      (prefix+'etc/bash_completion.d').install "git-flow-completion.bash"
-      (share+'zsh/site-functions').install "git-flow-completion.zsh"
+      bash_completion.install "git-flow-completion.bash"
+      zsh_completion.install "git-flow-completion.zsh"
     end
   end
 
diff --git a/Library/Formula/git-flow.rb b/Library/Formula/git-flow.rb
index cad6bf5d9..e35cd2195 100644
--- a/Library/Formula/git-flow.rb
+++ b/Library/Formula/git-flow.rb
@@ -23,8 +23,8 @@ class GitFlow < Formula
     system "make", "prefix=#{prefix}", "install"
 
     GitFlowCompletion.new('git-flow-completion').brew do
-      (prefix+'etc/bash_completion.d').install "git-flow-completion.bash"
-      (share+'zsh/site-functions').install "git-flow-completion.zsh"
+      bash_completion.install "git-flow-completion.bash"
+      zsh_completion.install "git-flow-completion.zsh"
     end
   end
 end
diff --git a/Library/Formula/git-gerrit.rb b/Library/Formula/git-gerrit.rb
index e4a8216f4..4220425e4 100644
--- a/Library/Formula/git-gerrit.rb
+++ b/Library/Formula/git-gerrit.rb
@@ -7,7 +7,6 @@ class GitGerrit < Formula
 
   def install
     prefix.install 'bin'
-
-    (prefix+'etc/bash_completion.d').install 'completion/git-gerrit-completion.bash'
+    bash_completion.install 'completion/git-gerrit-completion.bash'
   end
 end
diff --git a/Library/Formula/git-now.rb b/Library/Formula/git-now.rb
index ce831cea4..876dba292 100644
--- a/Library/Formula/git-now.rb
+++ b/Library/Formula/git-now.rb
@@ -15,7 +15,7 @@ class GitNow < Formula
 
   def install
     system "make", "prefix=#{prefix}", "install"
-    (share+'zsh/site-functions').install 'etc/_git-now'
+    zsh_completion.install 'etc/_git-now'
   end
 end
 
diff --git a/Library/Formula/go.rb b/Library/Formula/go.rb
index 9bcb236a6..90f7141ce 100644
--- a/Library/Formula/go.rb
+++ b/Library/Formula/go.rb
@@ -26,8 +26,8 @@ class Go < Formula
 
   def install
     # install the completion scripts
-    (prefix/'etc/bash_completion.d').install 'misc/bash/go' => 'go-completion.bash'
-    (share/'zsh/site-functions').install 'misc/zsh/go' => '_go'
+    bash_completion.install 'misc/bash/go' => 'go-completion.bash'
+    zsh_completion.install 'misc/zsh/go' => '_go'
 
     if build.include? 'cross-compile-all'
       targets = [
diff --git a/Library/Formula/leiningen.rb b/Library/Formula/leiningen.rb
index 8d1cb0533..969f8affd 100644
--- a/Library/Formula/leiningen.rb
+++ b/Library/Formula/leiningen.rb
@@ -10,7 +10,7 @@ class Leiningen < Formula
   def install
     bin.install "bin/lein"
     system "#{bin}/lein", "self-install"
-    (etc+'bash_completion.d').install 'bash_completion.bash' => 'lein-completion.bash'
+    bash_completion.install 'bash_completion.bash' => 'lein-completion.bash'
   end
 
   def caveats; <<-EOS.undent
diff --git a/Library/Formula/mercurial.rb b/Library/Formula/mercurial.rb
index d6b8e9c88..b5dc41d7f 100644
--- a/Library/Formula/mercurial.rb
+++ b/Library/Formula/mercurial.rb
@@ -16,8 +16,7 @@ class Mercurial < Formula
     # System-provided Python.
     ENV.minimal_optimization
 
-    # install the completion script
-    (prefix/'etc/bash_completion.d').install 'contrib/bash_completion' => 'hg-completion.bash'
+    bash_completion.install 'contrib/bash_completion' => 'hg-completion.bash'
 
     system "make doc" if build.head? or build.include? 'doc'
     system "make local"
diff --git a/Library/Formula/ninja.rb b/Library/Formula/ninja.rb
index bbcd36c95..7dd208466 100644
--- a/Library/Formula/ninja.rb
+++ b/Library/Formula/ninja.rb
@@ -8,6 +8,6 @@ class Ninja < Formula
   def install
     system "./bootstrap.py"
     bin.install "ninja"
-    (prefix/'etc/bash_completion.d').install 'misc/bash-completion' => 'ninja-completion.sh'
+    bash_completion.install 'misc/bash-completion' => 'ninja-completion.sh'
   end
 end
diff --git a/Library/Formula/r.rb b/Library/Formula/r.rb
index 23415eab2..a6135306f 100644
--- a/Library/Formula/r.rb
+++ b/Library/Formula/r.rb
@@ -55,9 +55,7 @@ class R < Formula
     ln_s prefix+"R.framework/Resources/man1/R.1", man1
     ln_s prefix+"R.framework/Resources/man1/Rscript.1", man1
 
-    bash_dir = prefix + 'etc/bash_completion.d'
-    bash_dir.mkpath
-    RBashCompletion.new.brew { bash_dir.install 'R' }
+    RBashCompletion.new.brew { bash_completion.install 'R' }
 
     prefix.install 'make-check.log' if build.include? 'test'
   end
diff --git a/Library/Formula/rabbitmq.rb b/Library/Formula/rabbitmq.rb
index 0aa2f06f5..8c8f21c14 100644
--- a/Library/Formula/rabbitmq.rb
+++ b/Library/Formula/rabbitmq.rb
@@ -38,7 +38,7 @@ class Rabbitmq < Formula
 
     sbin.install 'rabbitmqadmin'
 
-    (prefix+'etc/bash_completion.d/rabbitmqadmin.bash').write `#{sbin}/rabbitmqadmin --bash-completion`
+    (bash_completion/'rabbitmqadmin.bash').write `#{sbin}/rabbitmqadmin --bash-completion`
   end
 
   def caveats; <<-EOS.undent
diff --git a/Library/Formula/savana.rb b/Library/Formula/savana.rb
index 1152f3c7c..6f0f4e937 100644
--- a/Library/Formula/savana.rb
+++ b/Library/Formula/savana.rb
@@ -15,6 +15,6 @@ class Savana < Formula
     libexec.install %w[bin lib logging.properties]
     bin.write_exec_script libexec/'bin/sav'
 
-    (prefix+'etc/bash_completion.d').install 'etc/bash_completion' => 'savana-completion.bash'
+    bash_completion.install 'etc/bash_completion' => 'savana-completion.bash'
   end
 end
diff --git a/Library/Formula/scala.rb b/Library/Formula/scala.rb
index 8844b22bd..096e50fdc 100644
--- a/Library/Formula/scala.rb
+++ b/Library/Formula/scala.rb
@@ -26,7 +26,7 @@ class Scala < Formula
     man1.install Dir['man/man1/*']
     libexec.install Dir['*']
     bin.install_symlink Dir["#{libexec}/bin/*"]
-    ScalaCompletion.new.brew { (prefix/'etc/bash_completion.d').install 'scala' }
+    ScalaCompletion.new.brew { bash_completion.install 'scala' }
     ScalaDocs.new.brew { doc.install Dir['*'] } if build.include? 'with-docs'
   end
 end
diff --git a/Library/Formula/source-highlight.rb b/Library/Formula/source-highlight.rb
index 4d6191390..21e3dd8ba 100644
--- a/Library/Formula/source-highlight.rb
+++ b/Library/Formula/source-highlight.rb
@@ -14,6 +14,6 @@ class SourceHighlight < Formula
                           "--with-boost=#{HOMEBREW_PREFIX}"
     system "make install"
 
-    (prefix+'etc/bash_completion.d').install 'completion/source-highlight'
+    bash_completion.install 'completion/source-highlight'
   end
 end
diff --git a/Library/Formula/subversion.rb b/Library/Formula/subversion.rb
index 197858871..21d4ecd81 100644
--- a/Library/Formula/subversion.rb
+++ b/Library/Formula/subversion.rb
@@ -105,7 +105,7 @@ class Subversion < Formula
     system "./configure", *args
     system "make"
     system "make install"
-    (prefix+'etc/bash_completion.d').install 'tools/client-side/bash_completion' => 'subversion'
+    bash_completion.install 'tools/client-side/bash_completion' => 'subversion'
 
     if build.include? 'python'
       system "make swig-py"
diff --git a/Library/Formula/task.rb b/Library/Formula/task.rb
index 8ccddc9f1..67e8495be 100644
--- a/Library/Formula/task.rb
+++ b/Library/Formula/task.rb
@@ -10,7 +10,7 @@ class Task < Formula
   def install
     system "cmake", ".", *std_cmake_args
     system "make install"
-    (prefix/'etc/bash_completion.d').install 'scripts/bash/task.sh'
-    (share/'zsh/site-functions').install 'scripts/zsh/_task'
+    bash_completion.install 'scripts/bash/task.sh'
+    zsh_completion.install 'scripts/zsh/_task'
   end
 end
diff --git a/Library/Formula/tig.rb b/Library/Formula/tig.rb
index 481ff3516..4fd6c4c8c 100644
--- a/Library/Formula/tig.rb
+++ b/Library/Formula/tig.rb
@@ -11,6 +11,6 @@ class Tig < Formula
     system "make install-doc-man"
 
     doc.install Dir['*.html']
-    (prefix+'etc/bash_completion.d').install 'contrib/tig-completion.bash'
+    bash_completion.install 'contrib/tig-completion.bash'
   end
 end
diff --git a/Library/Formula/tmux.rb b/Library/Formula/tmux.rb
index 6cf36c9ed..a24142c4b 100644
--- a/Library/Formula/tmux.rb
+++ b/Library/Formula/tmux.rb
@@ -34,7 +34,7 @@ class Tmux < Formula
                           "--sysconfdir=#{etc}"
     system "make install"
 
-    (prefix+'etc/bash_completion.d').install "examples/bash_completion_tmux.sh" => 'tmux'
+    bash_completion.install "examples/bash_completion_tmux.sh" => 'tmux'
   end
 
   def test
diff --git a/Library/Formula/todo-txt.rb b/Library/Formula/todo-txt.rb
index 33f18a90b..a2676f956 100644
--- a/Library/Formula/todo-txt.rb
+++ b/Library/Formula/todo-txt.rb
@@ -10,7 +10,7 @@ class TodoTxt < Formula
   def install
     bin.install 'todo.sh'
     prefix.install 'todo.cfg' # Default config file
-    (prefix+'etc/bash_completion.d').install 'todo_completion'
+    bash_completion.install 'todo_completion'
   end
 
   def caveats; <<-EOS.undent
diff --git a/Library/Formula/unp.rb b/Library/Formula/unp.rb
index fa11eb4aa..a06530cf2 100644
--- a/Library/Formula/unp.rb
+++ b/Library/Formula/unp.rb
@@ -19,7 +19,7 @@ class Unp < Formula
   def install
     bin.install %w[unp ucat]
     man1.install "debian/unp.1"
-    (prefix+'etc/bash_completion.d').install 'bash_completion.d/unp'
+    bash_completion.install 'bash_completion.d/unp'
     %w[ COPYING CHANGELOG ].each { |f| rm f }
     mv 'debian/README.Debian', 'README'
     mv 'debian/copyright', 'COPYING'
diff --git a/Library/Formula/youtube-dl.rb b/Library/Formula/youtube-dl.rb
index e69f6ea62..fcdb43a07 100644
--- a/Library/Formula/youtube-dl.rb
+++ b/Library/Formula/youtube-dl.rb
@@ -9,7 +9,7 @@ class YoutubeDl < Formula
     system "make", "youtube-dl", "PREFIX=#{prefix}"
     bin.install 'youtube-dl'
     man1.install 'youtube-dl.1'
-    (prefix+'etc/bash_completion.d').install 'youtube-dl.bash-completion'
+    bash_completion.install 'youtube-dl.bash-completion'
   end
 
   def caveats