Remove fishfish

Replaced by fish 2.0.

3 files changed, 5 insertions, 38 deletions

diff --git a/Library/Aliases/fishfish b/Library/Aliases/fishfish
new file mode 120000
index 000000000..3cca090ca
--- /dev/null
+++ b/Library/Aliases/fishfish
@@ -0,0 +1 @@
+../Formula/fish
\ No newline at end of file
diff --git a/Library/Formula/fish.rb b/Library/Formula/fish.rb
index 3da570adc..39edff03d 100644
--- a/Library/Formula/fish.rb
+++ b/Library/Formula/fish.rb
@@ -13,14 +13,16 @@ class Fish < Formula
 
   skip_clean 'share/doc'
 
-  conflicts_with "fishfish"
-
   def install
     system "autoconf"
     system "./configure", "--prefix=#{prefix}"
     system "make install"
   end
 
+  test do
+    system "fish", "-c", "echo"
+  end
+
   def caveats; <<-EOS.undent
     You will need to add:
       #{HOMEBREW_PREFIX}/bin/fish
diff --git a/Library/Formula/fishfish.rb b/Library/Formula/fishfish.rb
deleted file mode 100644
index f9a589320..000000000
--- a/Library/Formula/fishfish.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-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
-  depends_on 'doxygen' => :build
-
-  conflicts_with "fish"
-
-  def install
-    system "autoconf"
-    system "./configure", "--prefix=#{prefix}", "--without-xsel"
-    system "make install"
-  end
-
-  test do
-    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