[arch-commits] Commit in mlocate/trunk (PKGBUILD updatedb.cron updatedb.cron.daily)

[Gaetan Bisson]

    Date: Saturday, September 22, 2012 @ 05:14:58
  Author: bisson
Revision: 166922

upstream update, cleanup PKGBUILD and simplify cron script (assuming base installed)

Added:
  mlocate/trunk/updatedb.cron
    (from rev 166921, mlocate/trunk/updatedb.cron.daily)
Modified:
  mlocate/trunk/PKGBUILD
Deleted:
  mlocate/trunk/updatedb.cron.daily

---------------------+
 PKGBUILD            |   58 ++++++++++++++++++++++++--------------------------
 updatedb.cron       |    6 +++++
 updatedb.cron.daily |   29 -------------------------
 3 files changed, 34 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-22 08:46:35 UTC (rev 166921)
+++ PKGBUILD	2012-09-22 09:14:58 UTC (rev 166922)
@@ -1,51 +1,49 @@
 # $Id$
-# Maintainer: Allan McRae <allan at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
 # Contributor: lydgate
 
 pkgname=mlocate
-pkgver=0.25
-pkgrel=2
-pkgdesc="Faster merging drop-in for slocate"
+pkgver=0.26
+pkgrel=1
+pkgdesc='Merging locate/updatedb implementation'
+url='https://fedorahosted.org/mlocate/'
 arch=('i686' 'x86_64')
-url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate"
 license=('GPL')
-depends=('glibc' 'coreutils' 'sh')
 backup=('etc/updatedb.conf'
         'etc/cron.daily/updatedb')
-source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz
-	updatedb.conf
-	updatedb.cron.daily)
-md5sums=('c6d043b170613b0e327a815b497f680a'
-         'b56d81de17fe29b01b4b28861acb8fd4'
-         'cde5da81bebad2de556ef2e43d895e13')
+source=("https://fedorahosted.org/releases/m/l/mlocate/mlocate-${pkgver}.tar.xz"
+	'updatedb.conf'
+	'updatedb.cron')
+sha1sums=('c6e6d81b25359c51c545f4b8ba0f3b469227fcbc'
+          '0150379149bf9d714bc81332d775fc273e7e3535'
+          '8301e6277d27db539af6cf4bc243e8e247bffc2e')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-  sed -i '/^groupname /s/mlocate/locate/' Makefile.in
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
-  make
-
+	sed -i '/^groupname /s/mlocate/locate/' Makefile.in
+	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
+	make
 }
 
 check() {
-  cd $srcdir/$pkgname-$pkgver
-  make check
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make check
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR=$pkgdir install
+	make DESTDIR="${pkgdir}" install
 
-  ln -s locate $pkgdir/usr/bin/slocate
-  chgrp 21 $pkgdir/usr/bin/locate
-  chmod 2755 $pkgdir/usr/bin/locate
+	chgrp 21 "${pkgdir}/usr/bin/locate"
+	chmod 2755 "${pkgdir}/usr/bin/locate"
+	ln -s locate "${pkgdir}/usr/bin/slocate"
 
-  install -dm755 $pkgdir/var/lib
-  install -dm750 -g21 $pkgdir/var/lib/locate
-  
-  # Set up a default updatedb.conf and a daily cronjob
-  install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf
-  install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb
+	install -dm755 "${pkgdir}/var/lib"
+	install -dm750 -g21 "${pkgdir}/var/lib/locate"
+	
+	install -Dm644 ../updatedb.conf "${pkgdir}/etc/updatedb.conf"
+	install -Dm744 ../updatedb.cron "${pkgdir}/etc/cron.daily/updatedb"
 }

Copied: mlocate/trunk/updatedb.cron (from rev 166921, mlocate/trunk/updatedb.cron.daily)
===================================================================
--- updatedb.cron	                        (rev 0)
+++ updatedb.cron	2012-09-22 09:14:58 UTC (rev 166922)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+NICE='nice -n 19'
+IONICE='ionice -c 2 -n 7'
+
+exec ${IONICE} ${NICE} updatedb -f proc

Deleted: updatedb.cron.daily
===================================================================
--- updatedb.cron.daily	2012-09-22 08:46:35 UTC (rev 166921)
+++ updatedb.cron.daily	2012-09-22 09:14:58 UTC (rev 166922)
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
-NICE=19
-
-# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
-IONICE_CLASS=2
-
-# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
-IONICE_PRIORITY=7
-
-UPDATEDB="/usr/bin/updatedb"
-
-if [ -x /usr/bin/nice ]; then
-  UPDATEDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEDB}"
-fi
-
-if [ -x /usr/bin/ionice ]; then
-  UPDATEDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEDB}"
-fi
-
-# Update the "locate" database
-if [ -x /usr/bin/updatedb ]; then
-  if [ -f /etc/updatedb.conf ]; then
-    ${UPDATEDB}
-  else
-    ${UPDATEDB} -f proc
-  fi
-fi