. Allow Apache Solr to be run with either openjdk7 or openjdk8.

PR:		195860
Submitted by:	paul@gromit.dlib.vt.edu
This commit is contained in:
Greg Lewis 2015-02-15 21:36:29 +00:00
parent 2c4da2b583
commit 63cc5ce1c4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=379050

View file

@ -42,7 +42,7 @@ load_rc_config $name
required_files=${solr_instance}/solr.xml
pidfile=/var/run/solr.pid
command=/usr/sbin/daemon
procname=%%LOCALBASE%%/openjdk7/bin/java
procname=`env JAVAVM_DRYRUN=true JAVA_VERSION=1.7+ %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -f 2 -d =`
start_precmd="cd %%EXAMPLESDIR%%"
command_args="-f -p ${pidfile} ${procname} ${solr_flags} -Dsolr.solr.home=${solr_instance} -Dsolr.log=/var/log -jar %%EXAMPLESDIR%%/start.jar"