svn commit: r319436 - in head/news/sabnzbdplus: . files
Steve Wills
swills at FreeBSD.org
Thu May 30 17:18:22 UTC 2013
Author: swills
Date: Thu May 30 17:18:21 2013
New Revision: 319436
URL: http://svnweb.freebsd.org/changeset/ports/319436
Log:
- Put back PATH setting, so that unrar and par2 are found, but only add it to
prestart
- Bump PORTREVISION
Reported by: flo
Submitted by: "Mark Felder" <feld at feld.me> (maintainer, private email)
Modified:
head/news/sabnzbdplus/Makefile
head/news/sabnzbdplus/files/sabnzbd.in
Modified: head/news/sabnzbdplus/Makefile
==============================================================================
--- head/news/sabnzbdplus/Makefile Thu May 30 16:44:50 2013 (r319435)
+++ head/news/sabnzbdplus/Makefile Thu May 30 17:18:21 2013 (r319436)
@@ -2,6 +2,7 @@
PORTNAME= sabnzbdplus
PORTVERSION= 0.7.12
+PORTREVISION= 1
CATEGORIES= news
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
DISTNAME= SABnzbd-${PORTVERSION}-src
Modified: head/news/sabnzbdplus/files/sabnzbd.in
==============================================================================
--- head/news/sabnzbdplus/files/sabnzbd.in Thu May 30 16:44:50 2013 (r319435)
+++ head/news/sabnzbdplus/files/sabnzbd.in Thu May 30 17:18:21 2013 (r319436)
@@ -38,7 +38,15 @@ required_dirs=${sabnzbd_conf_dir}
start_cmd="${name}_start"
status_cmd="${name}_status"
stop_cmd="${name}_stop"
-start_precmd=sabnzbd_check_dir
+start_precmd="${name}_prestart"
+
+sabnzbd_prestart()
+{
+ PATH=${PATH}:%%PREFIX%%/bin:%%PREFIX%%/sbin
+ if [ ! -f "${required_dirs}" -a ! -d "${required_dirs}" -a ! -L "${required_dirs}" ]; then
+ install -d -o ${sabnzbd_user} -g ${sabnzbd_group} ${required_dirs}
+ fi
+}
sabnzbd_start()
{
@@ -81,19 +89,12 @@ sabnzbd_stop()
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}"
- else
- echo "$name is not running"
- fi
-}
-
-sabnzbd_check_dir()
-{
- if [ ! -f "${required_dirs}" -a ! -d "${required_dirs}" -a ! -L "${required_dirs}" ]; then
- install -d -o ${sabnzbd_user} -g ${sabnzbd_group} ${required_dirs}
- fi
+ 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}"
+ else
+ echo "$name is not running"
+ fi
}
run_rc_command "$1"
More information about the svn-ports-head
mailing list