From: Sven Höxter <sven.hoexter@rewe-digital.com>
Date: Wed, 21 Mar 2018 10:04:34 +0000 (+0100)
Subject: Add Java 10 Server JRE support now that it's released.
X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;ds=sidebyside;p=sven%2Fjava-package.git

Add Java 10 Server JRE support now that it's released.
---

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