Revision: 4742
http://sourceforge.net/p/jump-pilot/code/4742
Author: edso
Date: 2016-01-08 10:17:08 +0000 (Fri, 08 Jan 2016)
Log Message:
-----------
detect openjdk version properly
"
openjdk version "1.8.0_72-internal"
OpenJDK Runtime Environment (build 1.8.0_72-internal-b05)
OpenJDK 64-Bit Server VM (build 25.72-b05, mixed mode)
"
Modified Paths:
--------------
core/trunk/scripts/oj_linux.sh
Modified: core/trunk/scripts/oj_linux.sh
===================================================================
--- core/trunk/scripts/oj_linux.sh 2016-01-05 17:40:40 UTC (rev 4741)
+++ core/trunk/scripts/oj_linux.sh 2016-01-08 10:17:08 UTC (rev 4742)
@@ -167,7 +167,7 @@
# java version check
JAVA_VERSIONSTRING="$("$JAVA" -version 2>&1)"
-JAVA_VERSION=$(echo $JAVA_VERSIONSTRING | awk -F'"' '/^java version/{print
$2}' | awk -F'.' '{print $1"."$2}')
+JAVA_VERSION=$(echo $JAVA_VERSIONSTRING | awk -F'[ \056]'
'{gsub(/["\047]+/,"")}/version [0-9]+\.[0-9]+/{print $3"."$4; exit}' )
JAVA_ARCH=$(echo $JAVA_VERSIONSTRING | grep -q -i 64-bit && echo x64 || echo
x86)
JAVA_NEEDED="1.6"
if ! is_decimal "$JAVA_VERSION"; then
------------------------------------------------------------------------------
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
