Revision: 5932
http://sourceforge.net/p/jump-pilot/code/5932
Author: edso
Date: 2018-08-27 15:25:30 +0000 (Mon, 27 Aug 2018)
Log Message:
-----------
rework version detection for 'openjdk version "12-ea"' in start scripts
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/scripts/oj_linux.sh
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2018-08-27 13:53:00 UTC (rev 5931)
+++ core/trunk/ChangeLog 2018-08-27 15:25:30 UTC (rev 5932)
@@ -4,7 +4,7 @@
#<-------------------------------- 80 chars
---------------------------------->#
2018-08-27 ede
- * oj_windows.bat rework version detection for 'openjdk version "12-ea"'
+ * rework version detection for 'openjdk version "12-ea"' in start scripts
* linux/mac starter remove javax.se.ee when run w/ java 11+
2018-08-24 mmichaud <m.michael.mich...@orange.fr>
Modified: core/trunk/scripts/oj_linux.sh
===================================================================
--- core/trunk/scripts/oj_linux.sh 2018-08-27 13:53:00 UTC (rev 5931)
+++ core/trunk/scripts/oj_linux.sh 2018-08-27 15:25:30 UTC (rev 5932)
@@ -167,7 +167,7 @@
# java version check
JAVA_VERSIONSTRING="$("$JAVA" -version 2>&1)"
-JAVA_VERSION=$(echo $JAVA_VERSIONSTRING | awk -F'[ \056]'
'{gsub(/["\047]+/,"")}/version [0-9]+\.[0-9]+/{print $3"."$4; exit}' )
+JAVA_VERSION=$( echo $JAVA_VERSIONSTRING | awk
'BEGIN{done=0}{gsub(/["\047]+/,"")}/[a-zA-Z]+ version
[0-9]+/{split($3,a,"[^0-9]"); if(match(a[2],/^[0-9]+$/)){print
a[1]"."a[2]}else{print a[1]".0"}; done=1}END{if(!done)exit 1}' )
JAVA_ARCH=$(echo $JAVA_VERSIONSTRING | grep -q -i 64-bit && echo x64 || echo
x86)
JAVA_NEEDED="1.6"
if ! is_decimal "$JAVA_VERSION"; then
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
