[arch-commits] Commit in redis/trunk (PKGBUILD redis.d)

[Sergej Pupykin]

    Date: Monday, May 13, 2013 @ 16:36:14
  Author: spupykin
Revision: 90716

upgpkg: redis 2.6.13-2

upd

Modified:
  redis/trunk/PKGBUILD
Deleted:
  redis/trunk/redis.d

----------+
 PKGBUILD |    5 ---
 redis.d  |   78 -------------------------------------------------------------
 2 files changed, 1 insertion(+), 82 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 14:36:10 UTC (rev 90715)
+++ PKGBUILD	2013-05-13 14:36:14 UTC (rev 90716)
@@ -5,7 +5,7 @@
 
 pkgname=redis
 pkgver=2.6.13
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64')
 url="http://redis.io/"
@@ -15,11 +15,9 @@
 backup=("etc/redis.conf"
 	"etc/logrotate.d/redis")
 source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
-	"redis.d"
 	"redis.service"
 	"redis.logrotate")
 md5sums=('c4be422013905c64af18b1ef140de21f'
-         '8d843919d9f165e9a47e56cadb4ac2ed'
          '5ab9fdb200e15c13b450fda77fa030b6'
          '9e2d75b7a9dc421122d673fe520ef17f')
 
@@ -35,7 +33,6 @@
   make INSTALL_BIN="$pkgdir/usr/bin" PREFIX=/usr install
 
   install -D -m755 "$srcdir/${pkgname}-${pkgver}/COPYING" "$pkgdir/usr/share/licenses/redis/COPYING"
-  install -D -m755 "$srcdir/redis.d" "$pkgdir/etc/rc.d/redis"
   install -Dm644 "$srcdir"/redis.service "$pkgdir"/usr/lib/systemd/system/redis.service
   install -Dm644 "$srcdir/redis.logrotate" "$pkgdir/etc/logrotate.d/redis"
   sed -i 's|daemonize no|daemonize yes|;s|dir \./|dir /var/lib/redis/|;s|logfile stdout|logfile /var/log/redis.log| ' $srcdir/${pkgname}-${pkgver}/redis.conf

Deleted: redis.d
===================================================================
--- redis.d	2013-05-13 14:36:10 UTC (rev 90715)
+++ redis.d	2013-05-13 14:36:14 UTC (rev 90716)
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-daemon_name=redis
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-REDISPORT=6379
-EXEC=/usr/bin/redis-server
-CLIEXEC=/usr/bin/redis-cli
-PIDFILE=/var/run/redis.pid
-WORKDIR=/var/lib/redis
-CONF="/etc/redis.conf"
-
-# Check if process exists
-PID=$(cat $PIDFILE 2>/dev/null)
-[ -d /proc/${PID} ] || rm -f $PIDFILE
-
-# Grab the server password, if exists
-REDISPASS=`egrep -o '^requirepass ([^#]+)' $CONF | cut -d\  -f 2`
-[ -n "$REDISPASS" ] && CLIEXEC="$CLIEXEC -a $REDISPASS"
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name"
-    [ -d $WORKDIR ] || mkdir $WORKDIR
-
-    if [ -f $PIDFILE ]; then
-      stat_fail
-      exit 1
-    else
-      $EXEC $CONF >/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        add_daemon $daemon_name
-        stat_done
-      fi
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name"
-
-    if [ ! -f $PIDFILE ]; then
-      stat_fail
-      exit 1
-    else
-      PID=$(cat $PIDFILE)
-
-      # And grab the server address
-      REDISADDR=`egrep -o '^bind ([^#]+)' $CONF | cut -d' ' -f2`
-      [ -n "$REDISADDR" ] && CLIEXEC="$CLIEXEC -h $REDISADDR"
-
-      $CLIEXEC -p $REDISPORT shutdown
-      [ -d /proc/${PID} ] && sleep 1
-      [ -d /proc/${PID} ] && sleep 5
-      [ -d /proc/${PID} ] && kill -9 $PID
-      [ -d /proc/${PID} ] && stat_fail || { stat_done; rm_daemon $daemon_name; }
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"  
-esac
-exit 0