Author: eevans
Date: Fri Jul 29 14:38:37 2011
New Revision: 1152241
URL: http://svn.apache.org/viewvc?rev=1152241&view=rev
Log:
honor path to java when JAVA_HOME set
Patch by Paul Cannon; reviewed by eevans for CASSANDRA-2785
Modified:
cassandra/branches/cassandra-0.8/bin/cassandra
cassandra/branches/cassandra-0.8/conf/cassandra-env.sh
cassandra/branches/cassandra-0.8/debian/cassandra.postinst
cassandra/branches/cassandra-0.8/debian/init
Modified: cassandra/branches/cassandra-0.8/bin/cassandra
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/bin/cassandra?rev=1152241&r1=1152240&r2=1152241&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/bin/cassandra (original)
+++ cassandra/branches/cassandra-0.8/bin/cassandra Fri Jul 29 14:38:37 2011
@@ -80,10 +80,10 @@ elif [ -r $CASSANDRA_INCLUDE ]; then
fi
# Use JAVA_HOME if set, otherwise look for java in PATH
-if [ -x $JAVA_HOME/bin/java ]; then
+if [ -n "$JAVA_HOME" ]; then
JAVA=$JAVA_HOME/bin/java
else
- JAVA=`which java`
+ JAVA=java
fi
if [ -z $CASSANDRA_CONF -o -z $CLASSPATH ]; then
Modified: cassandra/branches/cassandra-0.8/conf/cassandra-env.sh
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/conf/cassandra-env.sh?rev=1152241&r1=1152240&r2=1152241&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/conf/cassandra-env.sh (original)
+++ cassandra/branches/cassandra-0.8/conf/cassandra-env.sh Fri Jul 29 14:38:37
2011
@@ -92,7 +92,7 @@ JMX_PORT="7199"
JVM_OPTS="$JVM_OPTS -ea"
# add the jamm javaagent
-check_openjdk=$(java -version 2>&1 | awk '{if (NR == 2) {print $1}}')
+check_openjdk=$("${JAVA:-java}" -version 2>&1 | awk '{if (NR == 2) {print
$1}}')
if [ "$check_openjdk" != "OpenJDK" ]
then
JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.2.jar"
Modified: cassandra/branches/cassandra-0.8/debian/cassandra.postinst
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/debian/cassandra.postinst?rev=1152241&r1=1152240&r2=1152241&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/debian/cassandra.postinst (original)
+++ cassandra/branches/cassandra-0.8/debian/cassandra.postinst Fri Jul 29
14:38:37 2011
@@ -34,7 +34,7 @@ case "$1" in
cassandra
fi
- if [ -n $2 ] && dpkg --compare-versions "$2" le 0.6.4-2; then
+ if [ -n "$2" ] && dpkg --compare-versions "$2" le 0.6.4-2; then
chown -R cassandra: /var/lib/cassandra
chown -R cassandra: /var/log/cassandra
fi
Modified: cassandra/branches/cassandra-0.8/debian/init
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/debian/init?rev=1152241&r1=1152240&r2=1152241&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/debian/init (original)
+++ cassandra/branches/cassandra-0.8/debian/init Fri Jul 29 14:38:37 2011
@@ -30,23 +30,15 @@ JVM_SEARCH_DIRS="/usr/lib/jvm/java-6-ope
[ -e /etc/cassandra/cassandra.yaml ] || exit 0
[ -e /etc/cassandra/cassandra-env.sh ] || exit 0
-# Read Cassandra environment file.
-. /etc/cassandra/cassandra-env.sh
-
# Read configuration variable file if it is present
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-if [ -z "$JVM_OPTS" ]; then
- echo "Initialization failed; \$JVM_OPTS not set!" >&2
- exit 3
-fi
-
# If JAVA_HOME has not been set, try to determine it.
if [ -z "$JAVA_HOME" ]; then
# If java is in PATH, use a JAVA_HOME that corresponds to that. This is
# both consistent with how the upstream startup script works, and how
# Debian works (read: the use of alternatives to set a system JVM).
- if [ -n `which java` ]; then
+ if [ -n "`which java`" ]; then
java=`which java`
# Dereference symlink(s)
while true; do
@@ -67,6 +59,15 @@ if [ -z "$JAVA_HOME" ]; then
done
fi
fi
+JAVA="$JAVA_HOME/bin/java"
+
+# Read Cassandra environment file.
+. /etc/cassandra/cassandra-env.sh
+
+if [ -z "$JVM_OPTS" ]; then
+ echo "Initialization failed; \$JVM_OPTS not set!" >&2
+ exit 3
+fi
# Load the VERBOSE setting and other rcS variables
. /lib/init/vars.sh
