Merge branch 'master' of /home/git/repositories/nico/ympd

This commit is contained in:
Andy 2014-01-12 19:51:07 +01:00
commit fbcd0ac9e1
2 changed files with 5 additions and 4 deletions

View File

@ -8,8 +8,7 @@ set(CPACK_PACKAGE_VERSION_PATCH "4")
set(CPACK_GENERATOR "DEB;RPM;TGZ")
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(DEBIAN_PACKAGE_SECTION "web")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MPD web client based on Websockets and
Bootstrap")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MPD web client based on Websockets and Bootstrap")
set(CPACK_PACKAGE_CONTACT "Andrew Karpow <andy@ympd.org>")
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "andy@ndyk.de")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libssl1.0.0,libmpdclient2")

View File

@ -10,6 +10,8 @@
### END INIT INFO
#Author: Andrew Karpow <andy@ndyk.de>
. /lib/lsb/init-functions
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="ympd Daemon"
NAME=ympd
@ -36,14 +38,14 @@ do_start()
start-stop-daemon --start --background --quiet --pidfile $PIDFILE --make-pidfile \
--exec $DAEMON --test > /dev/null || return 1
start-stop-daemon --start --background --quiet --pidfile $PIDFILE --make-pidfile \
--exec $DAEMON --stdout $LOG_OUT --stderr $LOG_ERR -- $DAEMON_OPT || return 2
--exec $DAEMON -- $DAEMON_OPT || return 2
}
do_stop()
{
start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
RETVAL="$?"
[ "$RETVAL" = 2 ] && return 2
rm -f $PIDFILE
return "$RETVAL"