cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set an explicit path to javaPathHelper, don't rely on it being in PATH

Browse Source
This commit is contained in:
sthen 2011-03-28 20:55:12 +00:00
parent 1ab89bbaaa
commit b47961ed19
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/aircontrol/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.8 2011/03/17 16:49:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.9 2011/03/28 20:55:12 sthen Exp $
COMMENT= management tool for Ubiquiti wireless devices
DISTNAME= aircontrol-1.3.6-beta
PKGNAME= ${DISTNAME:S/-beta/beta/}
REVISION= 1
REVISION= 2
CATEGORIES= net

8
net/aircontrol/pkg/aircontrol.rc
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: aircontrol.rc,v 1.3 2011/03/17 16:49:27 ajacoutot Exp $
# $OpenBSD: aircontrol.rc,v 1.4 2011/03/28 20:55:12 sthen Exp $
daemon="${TRUEPREFIX}/bin/catalina.sh"
daemon_flags="-Xmx768M -server"
@ -8,20 +8,20 @@ daemon_user="_aircontrol"
. /etc/rc.d/rc.subr
pexp="$(javaPathHelper -h aircontrol).*-Dcatalina.base=/var/aircontrol"
pexp="$(${LOCALBASE}/bin/javaPathHelper -h aircontrol).*-Dcatalina.base=/var/aircontrol"
rc_reload=NO
rc_start() {
${rcexec} \
"CATALINA_OPTS=\"${daemon_flags}\" \
JAVA_HOME=\"$(javaPathHelper -h aircontrol)\" ${daemon} start"
JAVA_HOME=\"$(${LOCALBASE}/bin/javaPathHelper -h aircontrol)\" ${daemon} start"
}
rc_stop() {
${rcexec} \
"CATALINA_OPTS=\"${daemon_flags}\" \
JAVA_HOME=\"$(javaPathHelper -h aircontrol)\" \
JAVA_HOME=\"$(${LOCALBASE}/bin/javaPathHelper -h aircontrol)\" \
${daemon} stop"
}