[arch-commits] Commit in i8kmon/trunk (PKGBUILD i8kmon.conf.d i8kmon.daemon)

[Eric Bélanger]

    Date: Friday, March 11, 2011 @ 14:27:43
  Author: eric
Revision: 114262

upgpkg: i8kmon 1.33-2
Fixed config file reading problem (close FS#18447), Added config file for daemon script

Added:
  i8kmon/trunk/i8kmon.conf.d
Modified:
  i8kmon/trunk/PKGBUILD
  i8kmon/trunk/i8kmon.daemon

---------------+
 PKGBUILD      |   34 ++++++++++++++++++++--------------
 i8kmon.conf.d |    5 +++++
 i8kmon.daemon |    6 ++++--
 3 files changed, 29 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-11 18:19:46 UTC (rev 114261)
+++ PKGBUILD	2011-03-11 19:27:43 UTC (rev 114262)
@@ -4,30 +4,36 @@
 
 pkgname=i8kmon
 pkgver=1.33
-pkgrel=1
+pkgrel=2
 pkgdesc="Tk-based daemon for i8kutils and Dell Inspiron/Latitude notebooks"
+arch=('any')
 url="http://people.debian.org/~dz/i8k/"
 license=('GPL2')
-arch=('any')
 depends=('i8kutils' 'tk')
-backup=(etc/i8kutils/i8kmon.conf)
-source=(ftp://ftp.archlinux.org/other/i8kutils/i8kutils_$pkgver.tar.gz i8kmon.daemon)
-md5sums=('1ab077b301dbb0f4be8ef52eb3b97628'
-         '6a1680603c9a9e52479372d549308995')
+backup=('etc/i8kutils/i8kmon.conf' 'etc/conf.d/i8kmon')
+source=(ftp://ftp.archlinux.org/other/i8kutils/i8kutils_$pkgver.tar.gz i8kmon.daemon i8kmon.conf.d)
+md5sums=('1ab077b301dbb0f4be8ef52eb3b97628' '411de45dda5e1ce7ad0db47aa236a79a'\
+         'c35f173664d9180f40e062c905da10e1')
+sha1sums=('2701697dfe9c0e351cb412badd14fbf8191838c3' 'a7ead36e31d27d85a257242847e316ea85a2426f'\
+         'a3a38c19f1af4bfc59ac8c88cadfa2e6ee185a4c')
 
 build() {
-  cd $srcdir/i8kutils-$pkgver
+  cd "$srcdir/i8kutils-$pkgver"
 
   # conform to Arch Linux guidelines
-  sed -i 's|/etc/i8kmon|/etc/i8kutils/i8kmon.conf|g' i8kmon.1 || return 1
-  sed -i 's|/etc/i8kmon|/etc/i8kutils/i8kmon.conf|g' i8kmon || return 1
+  sed -i 's|/etc/i8kmon|/etc/i8kutils/i8kmon.conf|g' i8kmon.1
+  sed -i 's|/etc/i8kmon.conf|/etc/i8kutils/i8kmon.conf|g' i8kmon
+}
 
+package() {
+  cd "$srcdir/i8kutils-$pkgver"
+
   # no configure script, and Makefile has /usr hardcoded
-  install -D -m755 i8kmon $pkgdir/usr/bin/i8kmon || return 1
-  install -D -m644 i8kmon.conf $pkgdir/etc/i8kutils/i8kmon.conf || return 1
-  install -D -m644 i8kmon.1 $pkgdir/usr/share/man/man1/i8kmon.1 || return 1
+  install -D -m755 i8kmon "$pkgdir/usr/bin/i8kmon"
+  install -D -m644 i8kmon.conf "$pkgdir/etc/i8kutils/i8kmon.conf"
+  install -D -m644 i8kmon.1 "$pkgdir/usr/share/man/man1/i8kmon.1"
 
   # install daemon script.
-  install -D -m755 ../i8kmon.daemon $pkgdir/etc/rc.d/i8kmon || return 1
+  install -D -m755 ../i8kmon.daemon "$pkgdir/etc/rc.d/i8kmon"
+  install -D -m644 ../i8kmon.conf.d "$pkgdir/etc/conf.d/i8kmon"
 }
-# vim: ts=2 sw=2 et ft=sh

Added: i8kmon.conf.d
===================================================================
--- i8kmon.conf.d	                        (rev 0)
+++ i8kmon.conf.d	2011-03-11 19:27:43 UTC (rev 114262)
@@ -0,0 +1,5 @@
+#
+# Arguments to be passed to the i8kmon daemon
+#
+
+I8KMON_ARGS=""

Modified: i8kmon.daemon
===================================================================
--- i8kmon.daemon	2011-03-11 18:19:46 UTC (rev 114261)
+++ i8kmon.daemon	2011-03-11 19:27:43 UTC (rev 114262)
@@ -3,12 +3,14 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`fuser /proc/i8k 2>/dev/null`
+[ -f /etc/conf.d/i8kmon ] && . /etc/conf.d/i8kmon
+
+PID=$(fuser /proc/i8k 2>/dev/null)
 case "$1" in
   start)
     stat_busy "Starting i8kmon Daemon"
     if [ -z "$PID" ]; then 
-      /usr/bin/i8kmon -d &
+      /usr/bin/i8kmon -d $I8KMON_ARGS &
     fi
     if [ ! -z "$PID" -o $? -gt 0 ]; then
       stat_fail