Thu Aug 2 00:01:47 UTC 2012

2 files changed, 21 insertions, 22 deletions

diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD
index e5815714d..e0e29cafa 100644
--- a/community/fish/PKGBUILD
+++ b/community/fish/PKGBUILD
@@ -1,33 +1,36 @@
-# $Id: PKGBUILD 66524 2012-02-25 23:19:41Z lfleischer $
+# $Id: PKGBUILD 74604 2012-07-31 12:48:32Z bpiotrowski $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Jan Fader <jan.fader@web.de>
 
 pkgname=fish
-pkgver=1.23.1
-pkgrel=5
-pkgdesc="User friendly shell intended mostly for interactive use"
+pkgver=2.0b2
+pkgrel=1
+pkgdesc='Smart and user friendly shell intended mostly for interactive use'
 arch=('i686' 'x86_64')
-url="http://fishshell.com/"
-license=("GPL" "LGPL" "BSD" "MIT")
-depends=('ncurses' 'bc')
+url='http://ridiculousfish.com/shell/'
+license=('GPL2')
+depends=('python')
 makedepends=('doxygen')
 install=fish.install
-source=(http://fishshell.com/files/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('ead6b7c6cdb21f35a3d4aa1d5fa596f1')
+source=($pkgname-$pkgver.tar.gz::http://ridiculousfish.com/shell/files/fishfish.tar.gz)
+md5sums=('ebe5fe17f6925b9142aadc8ebae5fba1')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc  \
-     --docdir=/usr/share/doc/fish --without-xsel
+  cd "$srcdir"/fishfish
+  autoconf
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc  \
+              --without-xsel
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd "$srcdir"/fishfish
   make DESTDIR="$pkgdir" install
-  install -D -m644 user_doc/html/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
+
+  # compress man pages
+  find "$pkgdir"/usr/share/fish/man/ -type f | xargs gzip -9
 }
diff --git a/community/fish/fish.install b/community/fish/fish.install
index c3f89cd84..765006f95 100644
--- a/community/fish/fish.install
+++ b/community/fish/fish.install
@@ -1,15 +1,11 @@
 post_install() {
-  if [ ! "`grep /usr/bin/fish etc/shells`" ]; then
-    echo "updating /etc/shells... done."
-    sed -i "s|/bin/bash|/bin/bash\n/usr/bin/fish|" etc/shells
-  fi
+	grep -q '/usr/bin/zsh' etc/shells || echo '/usr/bin/zsh' >> etc/shells
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 pre_remove() {
-  echo -ne "updating /etc/shells... \n"
   sed -i '/^\/usr\/bin\/fish/d' /etc/shells
 }