From e9f3fb2960516974af64c2ad160ff99a60deeae2 Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Fri, 30 Jan 2015 22:36:13 +0800 Subject: [PATCH] Fix startup script for OpenJDK 8 Here are the version strings of four major implementations of java: Sun JDK 7 java version "1.7.0_76" OpenJDK 7 java version "1.7.0_75" Sun JDK 8 java version "1.8.0_31" OpenJDK 8 openjdk version "1.8.0_31" For OpenJDK 8, the version detector in resources/ffdec.sh fails. An extra `sed` is necessary for proper execution. --- resources/ffdec.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/ffdec.sh b/resources/ffdec.sh index 3b0b0df09..dfb09e152 100644 --- a/resources/ffdec.sh +++ b/resources/ffdec.sh @@ -52,6 +52,7 @@ cd "`dirname \"$PROGRAM\"`" # Check default java if [ -x "`which java`" ]; then JAVA_VERSION_OUTPUT=`java -version 2>&1` + JAVA_VERSION_OUTPUT=`echo $JAVA_VERSION_OUTPUT | sed 's/openjdk version/java version/'` check_java_version && exec java -Djava.net.preferIPv4Stack=true -Xmx$MEMORY -jar $JAR_FILE "$@" fi @@ -59,6 +60,7 @@ fi for JRE_PATH in $LOOKUP_JRE_DIRS; do if [ -x "$JRE_PATH/bin/java" ]; then JAVA_VERSION_OUTPUT=`"$JRE_PATH/bin/java" -version 2>&1` + JAVA_VERSION_OUTPUT=`echo $JAVA_VERSION_OUTPUT | sed 's/openjdk version/java version/'` check_java_version && { export JRE_PATH exec $JRE_PATH/bin/java -Djava.net.preferIPv4Stack=true -Xmx$MEMORY -jar $JAR_FILE "$@"