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

[Filipe Laíns via arch-commits]

Date: Sunday, November 17, 2019 @ 00:45:21
  Author: ffy00
Revision: 529852

fix missing /bin/fish entry from /etc/shells (3.0.2-3)

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

--+
 PKGBUILD |2 +-
 fish.install |3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-17 00:01:53 UTC (rev 529851)
+++ PKGBUILD2019-11-17 00:45:21 UTC (rev 529852)
@@ -7,7 +7,7 @@
 
 pkgname=fish
 pkgver=3.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Smart and user friendly shell intended mostly for interactive use'
 url='https://fishshell.com/'
 arch=('x86_64')

Modified: fish.install
===
--- fish.install2019-11-17 00:01:53 UTC (rev 529851)
+++ fish.install2019-11-17 00:45:21 UTC (rev 529852)
@@ -1,5 +1,6 @@
 post_install() {
   grep -qe '^/usr/bin/fish$' etc/shells || echo '/usr/bin/fish' >> etc/shells
+  grep -qe '^/bin/fish$' etc/shells || echo '/bin/fish' >> etc/shells
 }
 
 post_upgrade() {
@@ -7,7 +8,7 @@
 }
 
 pre_remove() {
-  sed -ri '\|^/usr/bin/fish$|d' etc/shells
+  sed -ri -e '\|^/usr/bin/fish$|d' -e '\|^/bin/fish$|d' etc/shells
 }
 
 # vim:set ts=2 sw=2 et:

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

[Levente Polyak]

Date: Friday, May 27, 2016 @ 19:27:35
  Author: anthraxx
Revision: 177312

upgpkg: fish 2.3.0-1

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

--+
 PKGBUILD |8 
 fish.install |6 --
 2 files changed, 4 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-27 17:20:07 UTC (rev 177311)
+++ PKGBUILD2016-05-27 17:27:35 UTC (rev 177312)
@@ -6,8 +6,8 @@
 # Contributor: Jan Fader 
 
 pkgname=fish
-pkgver=2.2.0
-pkgrel=5
+pkgver=2.3.0
+pkgrel=1
 pkgdesc='Smart and user friendly shell intended mostly for interactive use'
 url='http://fishshell.com/'
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@
 makedepends=('doxygen')
 install=fish.install
 
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/fish-shell/fish-shell/archive/${pkgver}.tar.gz)
-sha512sums=('a1108a8d5c96bcac1b1ced74e6f28287094fa68f28756811f6a6604bde2b4de88d7637da21874b602723fce129a407be7e24affecab468997158442af208308a')
+sha512sums=('32a67a825dfeac75d77099461eea6da3b49018b83873880bd44732cb92c082ccdb92f745d965c52a680dd015a856226ccc43601792b2def643a36ed5affa853f')
 
 prepare() {
   cd fish-shell-${pkgver}
@@ -37,4 +37,4 @@
   make DESTDIR="${pkgdir}" install
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:

Modified: fish.install
===
--- fish.install2016-05-27 17:20:07 UTC (rev 177311)
+++ fish.install2016-05-27 17:27:35 UTC (rev 177312)
@@ -4,12 +4,6 @@
 
 post_upgrade() {
   post_install
-
-  if [[ "$(vercmp $2 2.1.1)" -lt 0 ]]; then
-echo ":: With fish 2.1.1 release, the fishd socket has changed location 
due"
-echo "   to security concerns. To make fish pick up the changes, kill all"
-echo "   fishd processes."
-  fi
 }
 
 pre_remove() {

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

[Levente Polyak]

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
===
--- PKGBUILD2015-07-16 16:15:51 UTC (rev 137009)
+++ PKGBUILD2015-07-16 16:37:06 UTC (rev 137010)
@@ -1,5 +1,5 @@
-# $Id$
-# Maintainer:  Bartłomiej Piotrowski bpiotrow...@archlinux.org
+# Maintainer: Levente Polyak anthraxx[at]archlinux[dot]org
+# Contributor: Bartłomiej Piotrowski bpiotrow...@archlinux.org
 # Contributor: Kaiting Chen kaitocr...@gmail.com
 # Contributor: Abhishek Dasgupta abh...@gmail.com
 # Contributor: Eric Belanger e...@archlinux.org
@@ -6,31 +6,27 @@
 # Contributor: Jan Fader jan.fa...@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.install2015-07-16 16:15:51 UTC (rev 137009)
+++ fish.install2015-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:

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

[Bartłomiej Piotrowski]

Date: Sunday, March 9, 2014 @ 18:38:05
  Author: bpiotrowski
Revision: 106893

upgpkg: fish 2.1.0-2

add bc to dependencies and move python to optdeps (FS#39236)

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

--+
 PKGBUILD |   18 +++---
 fish.install |2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-09 17:27:31 UTC (rev 106892)
+++ PKGBUILD2014-03-09 17:38:05 UTC (rev 106893)
@@ -1,6 +1,6 @@
 # $Id$
-# Maintainer: Kaiting Chen kaitocr...@gmail.com
-# Maintainer:  Bartłomiej Piotrowski nos...@bpiotrowski.pl
+# Maintainer:  Bartłomiej Piotrowski bpiotrow...@archlinux.org
+# Contributor: Kaiting Chen kaitocr...@gmail.com
 # Contributor: Abhishek Dasgupta abh...@gmail.com
 # Contributor: Eric Belanger e...@archlinux.org
 # Contributor: Jan Fader jan.fa...@web.de
@@ -7,19 +7,19 @@
 
 pkgname=fish
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Smart and user friendly shell intended mostly for interactive use'
 arch=('i686' 'x86_64')
 url='http://fishshell.com/'
 license=('GPL2')
-depends=('python2' 'inetutils')
-makedepends=('doxygen' 'python')
+depends=('bc' 'gcc-libs' 'inetutils' 'ncurses')
+optdepends=('python: for manual page completion parser and web configuration 
tool')
 install=fish.install
 source=(http://fishshell.com/files/$pkgver/fish-$pkgver.tar.gz)
 md5sums=('3a29aebde522b8f52d9975d7423db99e')
 
 build() {
-  cd fish-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr \
 --sysconfdir=/etc \
 --without-xsel
@@ -27,9 +27,5 @@
 }
 
 package() {
-  cd fish-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # use python2
-  find $pkgdir/usr/share/fish/tools/ -type f -exec sed -e 
1s|python|python2| -i {} \;
+  make -C $pkgname-$pkgver DESTDIR=$pkgdir install
 }

Modified: fish.install
===
--- fish.install2014-03-09 17:27:31 UTC (rev 106892)
+++ fish.install2014-03-09 17:38:05 UTC (rev 106893)
@@ -1,5 +1,5 @@
 post_install() {
-   grep -q '/usr/bin/fish' etc/shells || echo '/usr/bin/fish'  etc/shells
+  grep -q '/usr/bin/fish' etc/shells || echo '/usr/bin/fish'  etc/shells
 }
 
 post_upgrade() {