make refine work with java7 as well
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2207 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
parent
16460d5474
commit
9025a64dd0
2
refine
2
refine
@ -834,7 +834,7 @@ 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
|
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|7)'`
|
||||||
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 the environment variable 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
|
||||||
|
Loading…
Reference in New Issue
Block a user