Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

eliminating requirement on JAVA_HOME being set

git-svn-id: http://svn.codehaus.org/jruby/trunk@2363 961051c9-f516-0410-bf72-c9f7e237a7b7
  • Loading branch information...
commit 896fb936aacce0e57b457c9abb09710660c72f73 1 parent b5811c6
@headius headius authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 jruby/bin/jruby
View
6 jruby/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
- exit 1
+ JAVA_CMD='java'
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" \
Please sign in to comment.
Something went wrong with that request. Please try again.