[arch-commits] Commit in fish/trunk (PKGBUILD fish.install)

Levente Polyak anthraxx at archlinux.org
Thu Jul 16 16:37:06 UTC 2015


    Date: Thursday, July 16, 2015 @ 18:37:06
  Author: anthraxx
Revision: 137010

upgpkg: fish 2.2.0-1

updpkg fish 2.2.0-1

Modified:
  fish/trunk/PKGBUILD
  fish/trunk/fish.install

--------------+
 PKGBUILD     |   26 ++++++++++++--------------
 fish.install |    6 ++++--
 2 files changed, 16 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-16 16:15:51 UTC (rev 137009)
+++ PKGBUILD	2015-07-16 16:37:06 UTC (rev 137010)
@@ -1,5 +1,5 @@
-# $Id$
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 # Contributor: Kaiting Chen <kaitocracy at gmail.com>
 # Contributor: Abhishek Dasgupta <abhidg at gmail.com>
 # Contributor: Eric Belanger <eric at archlinux.org>
@@ -6,31 +6,27 @@
 # Contributor: Jan Fader <jan.fader at web.de>
 
 pkgname=fish
-pkgver=2.1.2
+pkgver=2.2.0
 pkgrel=1
 pkgdesc='Smart and user friendly shell intended mostly for interactive use'
+url='http://fishshell.com/'
 arch=('i686' 'x86_64')
-url='http://fishshell.com/'
 license=('GPL2')
 depends=('bc' 'gcc-libs' 'inetutils' 'ncurses' 'which')
 optdepends=('python: for manual page completion parser and web configuration tool')
 makedepends=('doxygen')
 install=fish.install
-source=($pkgname-$pkgver.tar.gz::https://github.com/fish-shell/fish-shell/archive/$pkgver.tar.gz
-        fish-2.1.1-grep-options-is-deprecated.patch)
-md5sums=('855389f9ed4cbe9290ca8d45b9b23093'
-         '0c94b1ca8c54ed1a03b551f9b84160e5')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/fish-shell/fish-shell/archive/${pkgver}.tar.gz)
+sha512sums=('a1108a8d5c96bcac1b1ced74e6f28287094fa68f28756811f6a6604bde2b4de88d7637da21874b602723fce129a407be7e24affecab468997158442af208308a')
 
 prepare() {
-  cd fish-shell-$pkgver
-  patch -p1 -i ../fish-2.1.1-grep-options-is-deprecated.patch
-
-  echo $pkgver > version
+  cd fish-shell-${pkgver}
+  echo ${pkgver} > version
   autoconf -i
 }
 
 build() {
-  cd fish-shell-$pkgver
+  cd fish-shell-${pkgver}
   ./configure --prefix=/usr \
     --sysconfdir=/etc
   make
@@ -37,5 +33,7 @@
 }
 
 package() {
-  make -C fish-shell-$pkgver DESTDIR="$pkgdir" install
+  make -C fish-shell-${pkgver} DESTDIR="${pkgdir}" install
 }
+
+# vim:set ts=2 sw=2 et:

Modified: fish.install
===================================================================
--- fish.install	2015-07-16 16:15:51 UTC (rev 137009)
+++ fish.install	2015-07-16 16:37:06 UTC (rev 137010)
@@ -1,5 +1,5 @@
 post_install() {
-  grep -q '/usr/bin/fish' etc/shells || echo '/usr/bin/fish' >> etc/shells
+  grep -qe '^/usr/bin/fish$' etc/shells || echo '/usr/bin/fish' >> etc/shells
 }
 
 post_upgrade() {
@@ -13,5 +13,7 @@
 }
 
 pre_remove() {
-  sed -i '/^\/usr\/bin\/fish/d' /etc/shells
+  sed -ri '\|^/usr/bin/fish$|d' etc/shells
 }
+
+# vim:set ts=2 sw=2 et:



More information about the arch-commits mailing list