From 84d92f4ac69bc6668605ace7716642cb0b68169d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20H=C3=B6xter?= Date: Wed, 21 Mar 2018 11:04:34 +0100 Subject: [PATCH] Add Java 10 Server JRE support now that it's released. --- lib/oracle-server-jre.sh | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/oracle-server-jre.sh b/lib/oracle-server-jre.sh index 5d6b4ff..bcbde29 100644 --- a/lib/oracle-server-jre.sh +++ b/lib/oracle-server-jre.sh @@ -3,6 +3,19 @@ j2se_detect_oracle_server_j2re=oracle_server_j2re_detect oracle_server_j2re_detect() { j2se_release=0 + # JRE 10 GA release (serverjre-10_linux-x64_bin.tar.gz) + if [[ $archive_name =~ ^serverjre-10(\.([0-9]+)\.([0-9]+))?_linux-x64_bin\.tar\.gz ]] + then + j2se_release=10 + j2se_update=${BASH_REMATCH[1]:-.0.0} + j2se_arch=x64 + j2se_version_name="${j2se_release} version ${j2se_release}${j2se_update}" + j2se_version=${j2se_release}${j2se_update}${revision} + oracle_jre_bin_hl="jdb rmid jmap java javac xjc jstat jarsigner jinfo wsimport rmiregistry jstack wsgen jps keytool jar serialver jcmd jrunscript jstatd schemagen" + oracle_jre_bin_jre=" " + oracle_jre_lib_hl=" " + fi + # JRE 9 GA release (serverjre-9.0.1_linux-x64_bin.tar.gz) if [[ $archive_name =~ ^serverjre-9(\.([0-9]+)\.([0-9]+))?_linux-x64_bin\.tar\.gz ]] then @@ -87,9 +100,9 @@ EOF j2se_remove=oracle_server_j2re_remove j2se_jinfo=oracle_server_j2re_jinfo j2se_control=oracle_server_j2re_control - oracle_jre_bin_hl="java keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool" - oracle_jre_bin_jre="policytool" - oracle_jre_lib_hl="jexec" + oracle_jre_bin_hl="${oracle_jre_bin_hl:-java keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool}" + oracle_jre_bin_jre="${oracle_jre_bin_jre:-policytool}" + oracle_jre_lib_hl="${oracle_jre_lib_hl:-jexec}" j2se_package="$j2se_vendor-java$j2se_release-server-jre" exlude_libs="appletviewer libawt_xawt.so libsplashscreen.so policytool" j2se_run -- 2.39.2