s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ISSUE-258 avoid ignoring the JAVA_HOME environment if java is not in the path

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@1957 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Stefano Mazzocchi 2010-12-24 21:17:21 +00:00
parent 9c98842132
commit e6415bab4f
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
refine
View File

@ -818,21 +818,19 @@ if [ "$OS" = "macosx" ] ; then
fi fi
fi fi
JAVA="`which java 2> /dev/null`" if [ "$JAVA_HOME" ]; then
if [ -z "$JAVA" ] ; then
if [ "$JAVA_HOME" ] ; then
JAVA="$JAVA_HOME/bin/java" JAVA="$JAVA_HOME/bin/java"
if [ ! -f "$JAVA" ] ; then else
JAVA="`which javas 2> /dev/null`"
fi
if [ ! -x "$JAVA" ] ; then
error "Could not find the 'java' executable at '$JAVA', are you sure your JAVA_HOME environment variable is pointing to a proper java installation?" error "Could not find the 'java' executable at '$JAVA', are you sure your JAVA_HOME environment variable is pointing to a proper java installation?"
fi
else
error "The 'java' command should be in your path or the 'JAVA_HOME' environment variable should be set"
fi
fi fi
JAVA_VERSION=`$JAVA -version 2>&1 | grep version | cut -d ' ' -f 3 | egrep ^\"1\.6` JAVA_VERSION=`$JAVA -version 2>&1 | grep version | cut -d ' ' -f 3 | egrep ^\"1\.6`
if [ -z "$JAVA_VERSION" ] ; then if [ -z "$JAVA_VERSION" ] ; then
error "Google Refine requires Java version 6 or later. If you have multiple versions of Java installed, please set JAVA_HOME to the correct version." error "Google Refine requires Java version 6 or later. If you have multiple versions of Java installed, please set the environment variable JAVA_HOME to the correct version."
fi fi
# ----- Parse the command line args ------------------------------------------ # ----- Parse the command line args ------------------------------------------