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

more robust checking of java presence

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

22
gridworks
View File

@ -619,32 +619,30 @@ OPTS=""
SYSTEM=`uname` SYSTEM=`uname`
if [ "$SYSTEM" = "Darwin" -a "$JAVA_HOME" = "" ]; then
export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home"
fi
# ----- Load configurations ------------------------------------- # ----- Load configurations -------------------------------------
load_configs gridworks.ini 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 [ "$JAVA_HOME" ]; then
JAVA="$JAVA_HOME/bin/java"
else
JAVA=`which java` JAVA=`which java`
if [ -z "$JAVA" ]; then if [ -z "$JAVA" ]; then
if [ "$SYSTEM" = 'Darwin' ]; then if [ "$JAVA_HOME" ]; then
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home JAVA="$JAVA_HOME/bin/java"
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?"
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."
fi fi
# ----- Parse the command line args ------------------------------------------ # ----- Parse the command line args ------------------------------------------