Date: Mon, 27 May 2013 01:28:30 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319146 - in head/news/sabnzbdplus: . files Message-ID: <201305270128.r4R1SU0m063844@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Mon May 27 01:28:29 2013 New Revision: 319146 URL: http://svnweb.freebsd.org/changeset/ports/319146 Log: - Update to 0.7.12 - rc script passes rclint now PR: ports/178886 Submitted by: Mark Felder <feld@feld.me> Modified: head/news/sabnzbdplus/Makefile head/news/sabnzbdplus/distinfo head/news/sabnzbdplus/files/sabnzbd.in (contents, props changed) Modified: head/news/sabnzbdplus/Makefile ============================================================================== --- head/news/sabnzbdplus/Makefile Mon May 27 00:54:16 2013 (r319145) +++ head/news/sabnzbdplus/Makefile Mon May 27 01:28:29 2013 (r319146) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= sabnzbdplus -PORTVERSION= 0.7.11 +PORTVERSION= 0.7.12 CATEGORIES= news MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} DISTNAME= SABnzbd-${PORTVERSION}-src Modified: head/news/sabnzbdplus/distinfo ============================================================================== --- head/news/sabnzbdplus/distinfo Mon May 27 00:54:16 2013 (r319145) +++ head/news/sabnzbdplus/distinfo Mon May 27 01:28:29 2013 (r319146) @@ -1,2 +1,2 @@ -SHA256 (SABnzbd-0.7.11-src.tar.gz) = de9c22377e89b081b7c264993c159588acb86206d1b82a465554e2f9df39b311 -SIZE (SABnzbd-0.7.11-src.tar.gz) = 2273355 +SHA256 (SABnzbd-0.7.12-src.tar.gz) = 9763414af2b3b9eccf933d01dfe5404845aa4b2a5ce6b63c643fc5cb45d2fb9b +SIZE (SABnzbd-0.7.12-src.tar.gz) = 2275110 Modified: head/news/sabnzbdplus/files/sabnzbd.in ============================================================================== --- head/news/sabnzbdplus/files/sabnzbd.in Mon May 27 00:54:16 2013 (r319145) +++ head/news/sabnzbdplus/files/sabnzbd.in Mon May 27 01:28:29 2013 (r319146) @@ -1,5 +1,7 @@ #!/bin/sh # +# $FreeBSD$ +# # PROVIDE: sabnzbd # KEYWORD: shutdown # @@ -22,70 +24,63 @@ . /etc/rc.subr -name="sabnzbd" +name=sabnzbd rcvar=sabnzbd_enable - -# Required, for some reason, to find all our binaries when starting via service. -PATH="%%PREFIX%%/bin:$PATH" - load_rc_config ${name} -: ${sabnzbd_enable:="NO"} -: ${sabnzbd_user:="_sabnzbd"} -: ${sabnzbd_group:="_sabnzbd"} -: ${sabnzbd_conf_dir:="%%PREFIX%%/sabnzbd"} +: ${sabnzbd_enable:=NO} +: ${sabnzbd_user:=_sabnzbd} +: ${sabnzbd_group:=_sabnzbd} +: ${sabnzbd_conf_dir="%%PREFIX%%/sabnzbd"} required_dirs=${sabnzbd_conf_dir} start_cmd="${name}_start" -#start_postcmd="${name}_poststart" status_cmd="${name}_status" stop_cmd="${name}_stop" start_precmd=sabnzbd_check_dir - - sabnzbd_start() { -if [ ! -f "${sabnzbd_pid}" ]; then - su -m ${sabnzbd_user} -c "%%PREFIX%%/bin/SABnzbd.py --daemon -f ${sabnzbd_conf_dir}/sabnzbd.ini" - echo "Starting ${name}." -else - GETPROCESSPID=`/bin/ps -auxw | /usr/bin/awk '/SABnzbd.py/ && !/awk/ && !/sh/ {print $2}'` - PIDFROMFILE=`cat ${sabnzbd_pid}` - if [ "$GETPROCESSPID" = "$PIDFROMFILE" ]; then - echo "${name} already running with PID: ${PIDFROMFILE} ?" - echo "Remove ${sabnzbd_pid} manually if needed." - else - rm -f ${sabnzbd_pid} - su -m ${sabnzbd_user} -c "%%PREFIX%%/bin/SABnzbd.py --daemon -f ${sabnzbd_conf_dir}/sabnzbd.ini" - echo "Starting ${name}." - fi -fi + if [ ! -f "${sabnzbd_pid}" ]; then + su -m ${sabnzbd_user} -c "%%PREFIX%%/bin/SABnzbd.py --daemon -f ${sabnzbd_conf_dir}/sabnzbd.ini" + echo "Starting ${name}." + else + GETPROCESSPID=`/bin/ps -auxw | /usr/bin/awk '/SABnzbd.py/ && !/awk/ && !/sh/ {print $2}'` + PIDFROMFILE=`cat ${sabnzbd_pid}` + if [ "$GETPROCESSPID" = "$PIDFROMFILE" ]; then + echo "${name} already running with PID: ${PIDFROMFILE} ?" + echo "Remove ${sabnzbd_pid} manually if needed." + else + rm -f ${sabnzbd_pid} + su -m ${sabnzbd_user} -c "%%PREFIX%%/bin/SABnzbd.py --daemon -f ${sabnzbd_conf_dir}/sabnzbd.ini" + echo "Starting ${name}." + fi + fi } -#sabnzbd_poststart() { -# echo `/bin/ps -auxw | /usr/bin/awk '/SABnzbd.py/ && !/awk/ {print $2}'` > $sabnzbd_pid -#} - # SABnzbd can only be cleanly stopped by calling the http api -sabnzbd_stop() { - echo "Stopping $name" - if [ -f "${sabnzbd_conf_dir}/sabnzbd.ini" ]; then - apikey=`grep ^api_key ${sabnzbd_conf_dir}/sabnzbd.ini | tr -d " _"` - host=`grep -m1 -E '^host\ =\ [0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' ${sabnzbd_conf_dir}/sabnzbd.ini | tr -dc '[0-9].'` - if [ ${host} = "0.0.0.0" ] ; then host="localhost" ; fi - port=`grep -m1 ^port ${sabnzbd_conf_dir}/sabnzbd.ini | tr -dc '[0-9]'` - fetch -o /dev/null "http://${host}:${port}/api?mode=shutdown&${apikey}" > /dev/null 2>&1 - else - sabnzbd_pid=`ps -U ${sabnzbd_user} | grep "python.*SABnzbd.py.*--daemon" | grep -v 'grep' | awk '{print $1}'` - if [ -n "${sabnzbd_pid}" ]; then - kill ${sabnzbd_pid} - fi - fi +sabnzbd_stop() +{ + echo "Stopping $name" + if [ -f "${sabnzbd_conf_dir}/sabnzbd.ini" ]; then + apikey=`grep ^api_key ${sabnzbd_conf_dir}/sabnzbd.ini | tr -d " _"` + host=`grep -m1 -E '^host\ =\ [0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' ${sabnzbd_conf_dir}/sabnzbd.ini | tr -dc '[0-9].'` + if [ ${host} = "0.0.0.0" ] ; then + host="localhost" ; + fi + port=`grep -m1 ^port ${sabnzbd_conf_dir}/sabnzbd.ini | tr -dc '[0-9]'` + fetch -o /dev/null "http://${host}:${port}/api?mode=shutdown&${apikey}" > /dev/null 2>&1 + else + sabnzbd_pid=`ps -U ${sabnzbd_user} | grep "python.*SABnzbd.py.*--daemon" | grep -v 'grep' | awk '{print $1}'` + if [ -n "${sabnzbd_pid}" ]; then + kill ${sabnzbd_pid} + fi + fi } -sabnzbd_status() { +sabnzbd_status() +{ sabnzbd_pid=`ps -U ${sabnzbd_user} | grep "python.*SABnzbd.py.*--daemon" | grep -v 'grep' | awk '{print $1}'` if [ -n "${sabnzbd_pid}" ]; then echo "$name is running as ${sabnzbd_pid}" @@ -94,10 +89,10 @@ sabnzbd_status() { fi } -sabnzbd_check_dir() { +sabnzbd_check_dir() +{ if [ ! -f "${required_dirs}" -a ! -d "${required_dirs}" -a ! -L "${required_dirs}" ]; then - mkdir -p ${required_dirs} - chown ${sabnzbd_user}:${sabnzbd_group} ${required_dirs} + install -d -o ${sabnzbd_user} -g ${sabnzbd_group} ${required_dirs} fi }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305270128.r4R1SU0m063844>