Merge pull request #23 from rhwood/master

Use non-default JVM
280north · May 17, 2011 · 9f4894a · 9f4894a
2 parents 86915a6 + df2f066
commit 9f4894a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/bin/narwhal b/bin/narwhal
@@ -26,6 +26,11 @@ if [ -f "narwhal.local.conf" ]; then
     source "narwhal.local.conf"
 fi
 
+# if JAVA_HOME is set, prepend JAVA_HOME/bin to PATH so correct JVM is used
+if [ -d "$JAVA_HOME" ]; then
+    export PATH=$JAVA_HOME/bin:$PATH
+fi
+
 if [ -n "$NARWHAL_DEBUG" ]; then
     export NARWHAL_DEBUG
 fi