X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Foracle-j2re.sh;h=a7b6207e82d6a6def7172c122c4a8fcefdf41d0d;hp=4532c07a6dd6ef5dc5daf722e97e6c1806338773;hb=5d66647e0e30083e19c91e3f4b0236d7b51d7e31;hpb=262a79ad42b914c045cb4bd9c0344fb769cf951e

diff --git a/lib/oracle-j2re.sh b/lib/oracle-j2re.sh
index 4532c07..a7b6207 100644
--- a/lib/oracle-j2re.sh
+++ b/lib/oracle-j2re.sh
@@ -2,7 +2,7 @@
 j2se_detect_oracle_j2re=oracle_j2re_detect
 oracle_j2re_detect() {
 
-  if [[ $archive_name =~ jre-([0-9]+)u([0-9]+)-linux-(i586|x64)\.(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[2]}
@@ -19,7 +19,7 @@ oracle_j2re_detect() {
         if [[ "$j2se_arch" != "i586" ]]; then compatible=0; fi
         ;;
       amd64|x86_64-linux-gnu)
-        if [[ "$j2se_arch" != "x64" ]]; then compatible=0; fi
+        if [[ "$j2se_arch" != "x64" && "$j2se_arch" != "amd64" ]]; then compatible=0; fi
         ;;
     esac