Fixed the detection of the latest Java 8 documentation archives

[sven/java-package.git] / lib / oracle-jre.sh

diff --git a/lib/oracle-jre.sh b/lib/oracle-jre.sh
index b558835d2c31d4c6d6890a2050c09f1a55d82005..d69de39dc57c023b94c527eae6078a8e8f3bbf85 100644 (file)
--- a/lib/oracle-jre.sh
+++ b/lib/oracle-jre.sh
@@ -12,10 +12,10 @@ oracle_j2re_detect() {
     if [[ $j2se_update != "" ]]
     then
       j2se_version_name="$j2se_release Update $j2se_update"
-      j2se_version=${j2se_release}u${j2se_update}
+      j2se_version=${j2se_release}u${j2se_update}${revision}
     else
       j2se_version_name="$j2se_release GA"
-      j2se_version=${j2se_release}
+      j2se_version=${j2se_release}${revision}
     fi
   fi
 
@@ -29,10 +29,10 @@ oracle_j2re_detect() {
     if [[ $j2se_update != "" ]]
     then
       j2se_version_name="$j2se_release Update $j2se_update Early Access Release Build $j2se_build"
-      j2se_version=${j2se_release}u${j2se_update}~ea-build-${j2se_build}
+      j2se_version=${j2se_release}u${j2se_update}~ea-build-${j2se_build}${revision}
     else
       j2se_version_name="$j2se_release Early Access Release Build $j2se_build"
-      j2se_version=${j2se_release}~ea-build-${j2se_build}
+      j2se_version=${j2se_release}~ea-build-${j2se_build}${revision}
     fi
   fi
 
@@ -78,7 +78,7 @@ EOF
       j2se_jinfo=oracle_j2re_jinfo
       oracle_jre_bin_hl="java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool"
       oracle_jre_bin_jre="javaws policytool"
-      oracle_no_man_jre_bin_jre="ControlPanel"
+      oracle_no_man_jre_bin_jre="ControlPanel jcontrol"
       oracle_jre_lib_hl="jexec"
       j2re_run
     fi