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

Fixed: Mac OS X default to Java 5. export JAVA_HOME to Java 6

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@469 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Will Moffat 2010-04-13 22:14:02 +00:00
parent a1a8758c37
commit 8142b27ee4
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gridworks
View File

@ -625,6 +625,11 @@ load_configs gridworks.ini
# ----- Make sure there is an appropriate java environment is available ------------- # ----- Make sure there is an appropriate java environment is available -------------
if [ "$SYSTEM" = 'Darwin' ] && [ -z "$JAVA_HOME" ]; then
# Mac OS X defaults to Java 5. So update JAVA_HOME unless the user manually set it.
export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home"
JAVA="$JAVA_HOME/bin/java"
else
JAVA=`which java` JAVA=`which java`
if [ -z "$JAVA" ]; then if [ -z "$JAVA" ]; then
if [ "$JAVA_HOME" ]; then if [ "$JAVA_HOME" ]; then
@ -632,17 +637,15 @@ if [ -z "$JAVA" ]; then
if [ ! -f "$JAVA" ] ; then if [ ! -f "$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 fi
elif [ "$SYSTEM" = 'Darwin' ]; then
JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home"
JAVA="$JAVA_HOME/bin/java"
else else
error "The 'java' command should be in your path or the 'JAVA_HOME' environment variable should be set" error "The 'java' command should be in your path or the 'JAVA_HOME' environment variable should be set"
fi fi
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 "Gridworks requires Java version 6 or later." error "Gridworks requires Java version 6 or later. If you have multiple versions of Java installed, please set JAVA_HOME to the correct version."
fi fi
# ----- Parse the command line args ------------------------------------------ # ----- Parse the command line args ------------------------------------------