ag: do not require bash-completion

Closes #27418.

1 files changed, 22 insertions, 16 deletions

diff --git a/Library/Formula/the_silver_searcher.rb b/Library/Formula/the_silver_searcher.rb
index f1c249b8e..008180a73 100644
--- a/Library/Formula/the_silver_searcher.rb
+++ b/Library/Formula/the_silver_searcher.rb
@@ -1,24 +1,30 @@
-require 'formula'
+require "formula"
 
 class TheSilverSearcher < Formula
-  homepage 'https://github.com/ggreer/the_silver_searcher'
-  head 'https://github.com/ggreer/the_silver_searcher.git'
-  url 'https://github.com/ggreer/the_silver_searcher/archive/0.22.0.tar.gz'
-  sha1 '6908ef26405270f483476513d3016599507a92e6'
+  homepage "https://github.com/ggreer/the_silver_searcher"
+  head "https://github.com/ggreer/the_silver_searcher.git"
+  url "https://github.com/ggreer/the_silver_searcher/archive/0.22.0.tar.gz"
+  sha1 "6908ef26405270f483476513d3016599507a92e6"
 
   bottle do
-    cellar :any
-    sha1 "7f7c99a2238b58238ff74afa603a09c88a4b189a" => :mavericks
-    sha1 "8c3f0b4d6f22bd18aaed2ab38268fdf99e38d235" => :mountain_lion
-    sha1 "2370144c028fe38daef2c38163d9035d06d3adaa" => :lion
   end
 
-  depends_on :automake
-  depends_on :autoconf
-
-  depends_on 'pkg-config' => :build
-  depends_on 'pcre'
-  depends_on 'xz'
+  depends_on "autoconf" => :build
+  depends_on "automake" => :build
+
+  depends_on "pkg-config" => :build
+  depends_on "pcre"
+  depends_on "xz"
+
+  # Edit bash completion script to not require bash-completion
+  # The `have ag` test is redundant in any case, since the script will only
+  # be installed if Ag itself is installed. See:
+  # https://github.com/ggreer/the_silver_searcher/issues/208
+  # https://github.com/Homebrew/homebrew/issues/27418
+  patch do
+    url "https://github.com/thomasf/the_silver_searcher/commit/867dff8631bc80d760268f653265e4d3caf44f16.diff"
+    sha1 "09502c60a11658d9a08a6825e78defad96318bd9"
+  end
 
   def install
     # Stable tarball does not include pre-generated configure script
@@ -32,7 +38,7 @@ class TheSilverSearcher < Formula
     system "make"
     system "make install"
 
-    bash_completion.install 'ag.bashcomp.sh'
+    bash_completion.install "ag.bashcomp.sh"
   end
 
   test do