Explicitely set path to javaPathHelper; we do not want to rely whether

LOCALBASE/bin is in the PATH or not and this is consistent with what
other java rc scripts do.

prodded by Marc Peters
This commit is contained in:
ajacoutot 2013-03-04 15:56:13 +00:00
parent e66659d6a1
commit 3c1fa65ec8
2 changed files with 5 additions and 4 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.25 2012/10/23 20:43:52 jasper Exp $
# $OpenBSD: Makefile,v 1.26 2013/03/04 15:56:13 ajacoutot Exp $
COMMENT= XMPP real time collaboration server
DISTNAME= openfire_src_3_7_1
PKGNAME= openfire-3.7.1
CATEGORIES= net
REVISION= 0
MASTER_SITES= http://www.igniterealtime.org/downloadServlet?filename=openfire/

View File

@ -1,12 +1,12 @@
#!/bin/sh
#
# $OpenBSD: openfire.rc,v 1.2 2011/03/09 17:08:00 ajacoutot Exp $
# $OpenBSD: openfire.rc,v 1.3 2013/03/04 15:56:13 ajacoutot Exp $
OPENFIRE_HOME="${TRUEPREFIX}/openfire"
OPENFIRE_LIB="${OPENFIRE_HOME}/lib"
JAVACMD="$(javaPathHelper -c openfire)"
JAVA_HOME="$(javaPathHelper -h openfire)"
JAVACMD="$(${LOCALBASE}/bin/javaPathHelper -c openfire)"
JAVA_HOME="$(${LOCALBASE}/bin/javaPathHelper -h openfire)"
daemon="${JAVACMD}"
daemon_flags="-server -DopenfireHome=${OPENFIRE_HOME} -Dopenfire.lib.dir=${OPENFIRE_LIB} -jar ${OPENFIRE_LIB}/startup.jar"