From 9638a43c79e84e21bea94f02541e4abbf0cf4745 Mon Sep 17 00:00:00 2001
From: Igor Kapkov <igasgeek@me.com>
Date: Mon, 5 Nov 2018 06:56:53 +1100
Subject: [PATCH] hh 2.0

Closes #33719.

Signed-off-by: FX Coudert <fxcoudert@gmail.com>
---
 Formula/hh.rb        | 38 --------------------------------------
 Formula/hstr.rb      | 25 +++++++++++++++++++++++++
 formula_renames.json |  1 +
 3 files changed, 26 insertions(+), 38 deletions(-)
 delete mode 100644 Formula/hh.rb
 create mode 100644 Formula/hstr.rb

diff --git a/Formula/hh.rb b/Formula/hh.rb
deleted file mode 100644
index 77915b28f0..0000000000
--- a/Formula/hh.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-class Hh < Formula
-  desc "Bash and zsh history suggest box"
-  homepage "https://github.com/dvorka/hstr"
-  url "https://github.com/dvorka/hstr/releases/download/1.27/hh-1.27.0-tarball.tgz"
-  sha256 "32d7ae015c9a055fd9d0e1dc3f946a851feb4f17fb777281e7c4602ba07b6819"
-
-  bottle do
-    cellar :any
-    sha256 "7ffa119045c433257ecdae566d44cac9eec4a9ba9682083452eec22689b3a4f0" => :mojave
-    sha256 "a1e2b478c301d6c582040bcc4f8f05efad260de69fac49e979305e0f7e9b3221" => :high_sierra
-    sha256 "662118b81ed13840b804b8d22a850f1762465be491cf8132ffd8824fc46a2ec6" => :sierra
-    sha256 "e19f7381ac79726f29069c21f95b0ad64f1d880e428765bebab40e8cfdfff426" => :el_capitan
-  end
-
-  head do
-    url "https://github.com/dvorka/hstr.git"
-
-    depends_on "autoconf" => :build
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
-  depends_on "pkg-config" => :build
-  depends_on "readline"
-
-  def install
-    system "autoreconf", "-fvi" if build.head?
-    system "./configure", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}"
-    system "make", "install"
-  end
-
-  test do
-    ENV["HISTFILE"] = testpath/".hh_test"
-    (testpath/".hh_test").write("test\n")
-    assert_equal "test", shell_output("#{bin}/hh -n").chomp
-  end
-end
diff --git a/Formula/hstr.rb b/Formula/hstr.rb
new file mode 100644
index 0000000000..7fc9f664cc
--- /dev/null
+++ b/Formula/hstr.rb
@@ -0,0 +1,25 @@
+class Hstr < Formula
+  desc "Bash and zsh history suggest box"
+  homepage "https://github.com/dvorka/hstr"
+  url "https://github.com/dvorka/hstr/archive/2.0.tar.gz"
+  sha256 "8d93ed8bfee1a979e8d06646e162b70316e2097e16243636d81011ba1000627a"
+
+  depends_on "autoconf" => :build
+  depends_on "automake" => :build
+  depends_on "libtool" => :build
+  depends_on "pkg-config" => :build
+  depends_on "readline"
+
+  def install
+    system "autoreconf", "-fvi"
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
+    system "make", "install"
+  end
+
+  test do
+    ENV["HISTFILE"] = testpath/".hh_test"
+    (testpath/".hh_test").write("test\n")
+    assert_equal "test", shell_output("#{bin}/hh -n").chomp
+  end
+end
diff --git a/formula_renames.json b/formula_renames.json
index f9ec5a9804..9ae81a8689 100644
--- a/formula_renames.json
+++ b/formula_renames.json
@@ -86,6 +86,7 @@
   "gutenberg": "zola",
   "hamsterdb": "upscaledb",
   "heroku-toolbelt": "heroku",
+  "hh": "hstr",
   "htop-osx": "htop",
   "httpd24": "httpd",
   "influxdb08": "influxdb@0.8",