diff options
| author | Elan Ruusamäe | 2009-03-10 14:04:35 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | a472fe7a2940d65a5011f9ea2158abc8dd93d446 (patch) | |
| tree | 26ebead614855a266680faf920b506818d4c3dac | |
| parent | e371901defe9fd4ff6571d455edc8f44ba114a7e (diff) | |
| download | ApacheJServ-a472fe7a2940d65a5011f9ea2158abc8dd93d446.zip ApacheJServ-a472fe7a2940d65a5011f9ea2158abc8dd93d446.tar.gz | |
- use $JAVACMD from jpackage-utils
Changed files:
ApacheJServ.init -> 1.9
| -rw-r--r-- | ApacheJServ.init | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/ApacheJServ.init b/ApacheJServ.init index 0044ebe..295e8f5 100644 --- a/ApacheJServ.init +++ b/ApacheJServ.init @@ -31,9 +31,16 @@ else fi getconfig() { - JRE=$(awk -F= '/^wrapper.bin=/{print $2}' $JSERV_PROPERTIES) || JRE=/usr/bin/java - CLASSPATH=$(awk -F= '/^wrapper\.classpath/{print $2}' $JSERV_PROPERTIES | tr '\n' ':') - ENV=$(awk -F= '/^wrapper.env=/{printf("%s=%s\n", $2, $3)}' $JSERV_PROPERTIES) + # set JAVACMD from jpackage-utils if available + if [ -f /usr/share/java-utils/java-functions ]; then + . /usr/share/java-utils/java-functions + set_javacmd + fi + + JAVACMD=${JAVACMD:-$(awk -F= '$1 == "wrapper.bin" {print $2}' $JSERV_PROPERTIES)} + JAVACMD=${JAVACMD:-/usr/bin/java} + CLASSPATH=$(awk -F= -vORS=':' '$1 == "wrapper.classpath" {print $2}' $JSERV_PROPERTIES) + ENV=$(awk -F= '$1 == "wrapper.env" {printf("%s=%s\n", $2, $3)}' $JSERV_PROPERTIES) } start() { @@ -48,7 +55,7 @@ start() { --chuid jserv \ --background \ -- \ - -i $ENV PATH="$PATH" CLASSPATH="$CLASSPATH" LOGFILE=/var/log/jserv/stdout.log /usr/sbin/runjserv $JRE $JSERV_CLASS $JSERV_PROPERTIES + -i $ENV PATH="$PATH" CLASSPATH="$CLASSPATH" LOGFILE=/var/log/jserv/stdout.log /usr/sbin/runjserv $JAVACMD $JSERV_CLASS $JSERV_PROPERTIES RETVAL=$? if [ $RETVAL -eq 0 ]; then touch /var/lock/subsys/jserv |