Add support for server JRE (Closes: #776389)

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

diff --git a/lib/oracle-jre.sh b/lib/oracle-jre.sh
index a555182b9f8dc6f3c9da2e25f01594498ed69f3d..abc9a4f8ec681aac83c2ea31950b45bcc200dbe1 100644 (file)
--- a/lib/oracle-jre.sh
+++ b/lib/oracle-jre.sh
@@ -4,7 +4,7 @@ oracle_j2re_detect() {
   j2se_release=0
 
   # Update or GA release (jre-7u13-linux-x64.tar.gz)
-  if [[ $archive_name =~ jre-([0-9]+)(u([0-9]+))?-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]]
+  if [[ $archive_name =~ ^jre-([0-9]+)(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_j2re_detect() {
   fi
 
   # Early Access Release (jre-8-ea-bin-b103-linux-x64-15_aug_2013.tar.gz)
-  if [[ $archive_name =~ jre-([0-9]+)(u([0-9]+))?-(ea|fcs)-bin-(b[0-9]+)-linux-(i586|x64|amd64).*\.(bin|tar\.gz) ]]
+  if [[ $archive_name =~ ^jre-([0-9]+)(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]}
@@ -150,7 +150,7 @@ oracle_j2re_control() {
     done
     cat << EOF
 Package: $j2se_package
-Architecture: any
+Architecture: $j2se_debian_arch
 Depends: \${misc:Depends}, \${shlibs:Depends}, $depends
 Recommends: netbase
 Provides: java-virtual-machine, java-runtime, java2-runtime, $provides_runtime java-runtime-headless, java2-runtime-headless, $provides_headless java-browser-plugin