New formula: fishfish

This formula conflicts with the original fish formula, as they provide
the same executable (`fish`).

Closes #13258.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>

Updated original commit to migrate custom conflict class to the new conflicts_with DSL, added the conflict to fish, and changed GitHub URLs to https.

2 files changed, 38 insertions, 0 deletions

diff --git a/Library/Formula/fish.rb b/Library/Formula/fish.rb
index f1ab7f5cf..5e59bfac5 100644
--- a/Library/Formula/fish.rb
+++ b/Library/Formula/fish.rb
@@ -13,6 +13,8 @@ class Fish < Formula
   depends_on 'readline'
   skip_clean 'share/doc'
 
+  conflicts_with "fishfish"
+
   def patches
     p = []
 
diff --git a/Library/Formula/fishfish.rb b/Library/Formula/fishfish.rb
new file mode 100644
index 000000000..f9b8f3144
--- /dev/null
+++ b/Library/Formula/fishfish.rb
@@ -0,0 +1,36 @@
+require 'formula'
+
+class Fishfish < Formula
+  homepage 'http://ridiculousfish.com/shell'
+
+  url 'https://github.com/fish-shell/fish-shell.git',
+      :tag => 'OpenBeta_r2'
+  version 'OpenBeta_r2'
+
+  head 'https://github.com/fish-shell/fish-shell.git',
+       :branch => 'master'
+
+  depends_on :autoconf => :build
+  depends_on 'doxygen' => :build
+
+  conflicts_with "fish"
+
+  def install
+    system "autoconf"
+    system "./configure", "--prefix=#{prefix}", "--without-xsel"
+    system "make install"
+  end
+
+  def test
+    system "fish -c 'echo'"
+  end
+
+  def caveats; <<-EOS.undent
+    You will need to add:
+      #{HOMEBREW_PREFIX}/bin/fish
+    to /etc/shells. Run:
+      chsh -s #{HOMEBREW_PREFIX}/bin/fish
+    to make fish your default shell.
+    EOS
+  end
+end