svn commit: r953518 - /cassandra/trunk/debian/init

[jb...@apache.org]

Author: jbellis
Date: Fri Jun 11 00:46:34 2010
New Revision: 953518

URL: http://svn.apache.org/viewvc?rev=953518&view=rev
Log:
allow using sun jdk w/ debian init script.  patch by Coda Hale; reviewed by jbellis for CASSANDRA-1174

Modified:
    cassandra/trunk/debian/init

Modified: cassandra/trunk/debian/init
URL: http://svn.apache.org/viewvc/cassandra/trunk/debian/init?rev=953518&r1=953517&r2=953518&view=diff
==============================================================================
--- cassandra/trunk/debian/init (original)
+++ cassandra/trunk/debian/init Fri Jun 11 00:46:34 2010
@@ -17,11 +17,21 @@ NAME=cassandra
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 CONFDIR=/etc/cassandra
-JAVA_HOME="/usr/lib/jvm/java-6-openjdk/jre"
 JSVC=/usr/bin/jsvc
 JVM_MAX_MEM="1G"
 JVM_START_MEM="128M"
 
+# The first existing directory is used for JAVA_HOME
+JDK_DIRS="/usr/lib/jvm/java-6-sun /usr/lib/jvm/java-6-openjdk"
+
+# Look for the right JVM to use
+for jdir in $JDK_DIRS; do
+ if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
+ JAVA_HOME="$jdir"
+ fi
+done
+
+
 [ -e /usr/share/cassandra/apache-cassandra.jar ] || exit 0
 [ -e /etc/cassandra/cassandra.yaml ] || exit 0