Date: Sat, 18 Oct 2014 06:28:39 +0000 (UTC) From: Alexander Leidinger <netchild@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371092 - in head/net/serviio: . files Message-ID: <201410180628.s9I6SdJ1043519@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: netchild Date: Sat Oct 18 06:28:39 2014 New Revision: 371092 URL: https://svnweb.freebsd.org/changeset/ports/371092 QAT: https://qat.redports.org/buildarchive/r371092/ Log: Improve the status command of the rc script: - return error code if not running [1] - narrow down which java process to accept as "running" PR: 193728 [1] Noticed by: jason.unovitch@gmail.com [1] Modified: head/net/serviio/Makefile head/net/serviio/files/serviio.in Modified: head/net/serviio/Makefile ============================================================================== --- head/net/serviio/Makefile Sat Oct 18 03:37:35 2014 (r371091) +++ head/net/serviio/Makefile Sat Oct 18 06:28:39 2014 (r371092) @@ -3,7 +3,7 @@ PORTNAME= serviio PORTVERSION= 1.4.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net multimedia java www MASTER_SITES= http://download.serviio.org/releases/ EXTRACT_SUFX= -linux.tar.gz Modified: head/net/serviio/files/serviio.in ============================================================================== --- head/net/serviio/files/serviio.in Sat Oct 18 03:37:35 2014 (r371091) +++ head/net/serviio/files/serviio.in Sat Oct 18 06:28:39 2014 (r371092) @@ -32,11 +32,12 @@ stop_cmd="$command -stop" status_cmd=${name}_status serviio_status() { - serviio_pid=$(ps -aU ${serviio_user} | awk '/java/ {print $1}') + serviio_pid=$(ps -wwwaU ${serviio_user} | awk '/java.*org.serviio.MediaServer/ {print $1}') if [ -n "${serviio_pid}" ]; then echo "${name} is running as pid ${serviio_pid}" else echo "${name} is not running" + return 1 fi }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410180628.s9I6SdJ1043519>