diff --git a/.SRCINFO b/.SRCINFO index a77a694..d503dc3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = fish-git pkgdesc = User friendly shell intended mostly for interactive use. - pkgver = 3.7.1.r2151.g75da00df9 + pkgver = 3.7.1.r2398.g81ff6db62 pkgrel = 1 epoch = 2 url = https://github.com/fish-shell/fish-shell diff --git a/PKGBUILD b/PKGBUILD index 50ae725..0a5de9c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=fish-git _gitname="fish-shell" -pkgver=3.7.1.r2151.g75da00df9 +pkgver=3.7.1.r2398.g81ff6db62 pkgrel=1 epoch=2 pkgdesc="User friendly shell intended mostly for interactive use." diff --git a/fish.install b/fish.install index f5016fc..d14a4fe 100644 --- a/fish.install +++ b/fish.install @@ -1,20 +1,14 @@ 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 -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() { - post_install $1 + post_install } pre_remove() { - echo -ne "updating /etc/shells... \n" - sed -i '/^\/usr\/bin\/fish/d' /etc/shells + sed -ri -e '\|^/usr/bin/fish$|d' -e '\|^/bin/fish$|d' etc/shells } -op=$1 -shift - -$op $* +# vim:set ts=2 sw=2 et: