Thu Jul 17 03:55:04 UTC 2014

2 files changed, 22 insertions, 18 deletions

diff --git a/core/which/PKGBUILD b/core/which/PKGBUILD
index 481f51316..64f240be0 100644
--- a/core/which/PKGBUILD
+++ b/core/which/PKGBUILD
@@ -1,27 +1,31 @@
-# $Id: PKGBUILD 176251 2013-01-28 00:29:29Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 216932 2014-07-16 17:04:52Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=which
 pkgver=2.20
-pkgrel=6
-pkgdesc="A utility to show the full path of commands"
+pkgrel=7
+pkgdesc='A utility to show the full path of commands'
 arch=('i686' 'x86_64')
-url="http://www.xs4all.nl/~carlo17/which"
+url='http://savannah.gnu.org/projects/which'
 license=('GPL3')
 groups=('base' 'base-devel')
-depends=('glibc' 'sh')
+depends=('glibc' 'bash')
 install=which.install
-source=(http://www.xs4all.nl/~carlo17/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('95be0501a466e515422cde4af46b2744')
+source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('95be0501a466e515422cde4af46b2744'
+         'SKIP')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/core/which/which.install b/core/which/which.install
index 167e2506e..fdc5accba 100644
--- a/core/which/which.install
+++ b/core/which/which.install
@@ -2,19 +2,19 @@ infodir=/usr/share/info
 filelist=(which.info)
 
 post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info "$infodir/$file.gz" "$infodir/dir" 2>/dev/null
   done
 }
 
 post_upgrade() {
-  post_install $1
+  post_install "$1"
 }
 
 pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info --delete "$infodir/$file" "$infodir/dir" 2>/dev/null
   done
 }