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

#1604 upgrade java version check to accept all versions greater than 6

Browse Source
This commit is contained in:
Martin Robinson 2018-05-16 14:26:59 +01:00
parent 443b1c8165
commit cdb85d5974
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
refine
View File

@ -839,10 +839,8 @@ checkJavaMajorVersion() {
# Java 9+ starts with x using semver versioning # Java 9+ starts with x using semver versioning
major=`echo ${java_ver} | sed -E 's/([0-9]+)(-ea|(\.[0-9]+)*)/\1/g'` major=`echo ${java_ver} | sed -E 's/([0-9]+)(-ea|(\.[0-9]+)*)/\1/g'`
fi fi
if (( ${major} < 7 )); then
JAVA_VERSION=$(echo ${major} | egrep '^(6|7|8|9)') error "OpenRefine requires Java version 7 or later. If you have multiple versions of Java installed, please set the environment variable JAVA_HOME to the correct version."
if [ -z "$JAVA_VERSION" ] ; then
error "OpenRefine 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
} }