Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Jul 2020 07:32:58 +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: r541322 - in head/misc/openhab2: . files
Message-ID:  <202007060732.0667WwC5053311@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: netchild
Date: Mon Jul  6 07:32:57 2020
New Revision: 541322
URL: https://svnweb.freebsd.org/changeset/ports/541322

Log:
  - cleanup rc script
  - wait for PID on stop, there are situations where the stop may take
    a while [1]
  
  Submitted by:	Rafal Lukawiecki <raf@rafal.net>	[1]

Modified:
  head/misc/openhab2/Makefile
  head/misc/openhab2/files/openhab2.in

Modified: head/misc/openhab2/Makefile
==============================================================================
--- head/misc/openhab2/Makefile	Mon Jul  6 07:10:23 2020	(r541321)
+++ head/misc/openhab2/Makefile	Mon Jul  6 07:32:57 2020	(r541322)
@@ -3,7 +3,7 @@
 
 PORTNAME=	openhab2
 PORTVERSION=	2.5.6
-#PORTREVISION=	3
+PORTREVISION=	1
 CATEGORIES=	misc java
 MASTER_SITES=	https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F${PORTVERSION}/
 DISTNAME=	openhab-${PORTVERSION}

Modified: head/misc/openhab2/files/openhab2.in
==============================================================================
--- head/misc/openhab2/files/openhab2.in	Mon Jul  6 07:10:23 2020	(r541321)
+++ head/misc/openhab2/files/openhab2.in	Mon Jul  6 07:32:57 2020	(r541322)
@@ -61,8 +61,6 @@ export OPENHAB_LOGDIR="${openhab2_log_dir}"
 # for UTF-8 encoding, language can be set inside openhab:
 export LC_ALL=en_US.UTF-8
 
-#command=${OPENHAB_HOME}/start.sh
-#command_args="server"
 pidfile=/var/run/${name}/${name}.pid
 
 command=/usr/sbin/daemon
@@ -70,6 +68,9 @@ command_args="-p ${pidfile} -t openhab2 ${OPENHAB_HOME
 
 openhab2_stop() {
 	${OPENHAB_RUNTIME}/bin/stop
+	if [ -e ${pidfile} ]; then
+		wait_for_pids $(cat ${pidfile})
+	fi
 }
 
 openhab2_status() {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007060732.0667WwC5053311>