diff options
| author | netchild <netchild@FreeBSD.org> | 2014-10-18 14:28:39 +0800 |
|---|---|---|
| committer | netchild <netchild@FreeBSD.org> | 2014-10-18 14:28:39 +0800 |
| commit | 15730856d88fef69fb493824e053893e2907d388 (patch) | |
| tree | ae25c412a8086c3e49ac541d1210bea49cdfcae4 /net | |
| parent | c51fa8011f70715a4b05dae65be8152f70885380 (diff) | |
| download | freebsd-ports-gnome-15730856d88fef69fb493824e053893e2907d388.tar.gz freebsd-ports-gnome-15730856d88fef69fb493824e053893e2907d388.tar.zst freebsd-ports-gnome-15730856d88fef69fb493824e053893e2907d388.zip | |
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]
Diffstat (limited to 'net')
| -rw-r--r-- | net/serviio/Makefile | 2 | ||||
| -rw-r--r-- | net/serviio/files/serviio.in | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/serviio/Makefile b/net/serviio/Makefile index f3299a81a32e..00e326b1a0df 100644 --- a/net/serviio/Makefile +++ b/net/serviio/Makefile @@ -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 diff --git a/net/serviio/files/serviio.in b/net/serviio/files/serviio.in index f119db364b16..c09775032271 100644 --- a/net/serviio/files/serviio.in +++ b/net/serviio/files/serviio.in @@ -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 } |