eliminating requirement on JAVA_HOME being set

git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@2363 961051c9-f516-0410-bf72-c9f7e237a7b7
jruby · Oct 22, 2006 · a2a5c9e · a2a5c9e
1 parent bd4c92d
commit a2a5c9e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/bin/jruby b/bin/jruby
@@ -58,12 +58,12 @@ if [ -z "$JRUBY_OPTS" ] ; then
 fi
 
 if [ -z "$JAVA_HOME" ] ; then
-  echo You must set JAVA_HOME to point at your Java Development Kit installation
+  JAVA_CMD='java'
-  exit 1
 else
   if $cygwin; then
     JAVA_HOME=`cygpath -u "$JAVA_HOME"`
   fi
+  JAVA_CMD="$JAVA_HOME/bin/java"
 fi
 
 JRUBY_SHELL=/bin/sh
@@ -126,7 +126,7 @@ if [ "$1" = "EN_US" ]; then
   shift
 fi
 
-  "$JAVA_HOME/bin/java" $DEBUG -Xmx256m -ea -classpath "$CP" \
+  $JAVA_CMD $DEBUG -Xmx256m -ea -classpath "$CP" \
   "-Djruby.base=$JRUBY_BASE" \
   "-Djruby.home=$JRUBY_HOME" \
   "-Djruby.lib=$JRUBY_BASE/lib" \