ensure older pattern only match up to version 8

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

diff --git a/lib/oracle-server-jre.sh b/lib/oracle-server-jre.sh
index 2f30f0bc8bf9c2e5bead25c833e8330d2824a8f9..c64ababaf77201ca3aa990b2a2a70194c0bf5fb5 100644 (file)
--- a/lib/oracle-server-jre.sh
+++ b/lib/oracle-server-jre.sh
@@ -4,7 +4,7 @@ oracle_server_j2re_detect() {
   j2se_release=0
 
   # Update or GA release (server-jre-8u74-linux-x64.tar.gz)
-  if [[ $archive_name =~ server-jre-([0-9]+)(u([0-9]+))?-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]]
+  if [[ $archive_name =~ server-jre-([0-8]+)(u([0-9]+))?-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]]
   then
     j2se_release=${BASH_REMATCH[1]}
     j2se_update=${BASH_REMATCH[3]}
@@ -20,7 +20,7 @@ oracle_server_j2re_detect() {
   fi
 
   # Early Access Release (jre-8-ea-bin-b103-linux-x64-15_aug_2013.tar.gz)
-  if [[ $archive_name =~ server-jre-([0-9]+)(u([0-9]+))?-(ea|fcs)-bin-(b[0-9]+)-linux-(i586|x64|amd64).*\.(bin|tar\.gz) ]]
+  if [[ $archive_name =~ server-jre-([0-8]+)(u([0-9]+))?-(ea|fcs)-bin-(b[0-9]+)-linux-(i586|x64|amd64).*\.(bin|tar\.gz) ]]
   then
     j2se_release=${BASH_REMATCH[1]}
     j2se_update=${BASH_REMATCH[3]}
@@ -71,7 +71,7 @@ EOF
       j2se_found=true
       j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
       j2se_vendor="oracle"
-      j2se_title="Java™ Platform, Standard Edition $j2se_release Server Runtime Environment"
+      j2se_title="Java Platform, Standard Edition $j2se_release Server Runtime Environment"
 
       j2se_install=oracle_server_j2re_install
       j2se_remove=oracle_server_j2re_remove
@@ -81,6 +81,7 @@ EOF
       oracle_jre_bin_jre="policytool"
       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
     fi
   fi
@@ -113,7 +114,7 @@ EOF
 oracle_server_j2re_jinfo() {
     cat << EOF
 name=$j2se_name
-priority=$j2se_priority
+priority=${priority_override:-$j2se_priority}
 section=main
 EOF
     jinfos "hl" $jvm_base$j2se_name/bin/ $oracle_jre_bin_hl
@@ -133,7 +134,7 @@ oracle_server_j2re_control() {
     cat << EOF
 Package: $j2se_package
 Architecture: $j2se_debian_arch
-Depends: \${misc:Depends}, \${shlibs:Depends}, $depends
+Depends: \${misc:Depends}, \${shlibs:Depends}, java-common, $depends
 Recommends: netbase
 Provides: java-runtime-headless, java2-runtime-headless, $provides_headless
 Description: $j2se_title