use architecture-specific arrays

2 files changed, 28 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7650b3227634..c2a03863f9eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -25,7 +25,17 @@ pkgbase = zulu-embedded-jdk11
 	provides = java-runtime=11
 	provides = java-runtime-headless=11
 	options = !strip
-	source = https://cdn.azul.com/zulu-embedded/bin/zulu11.54.25-ca-jdk11.0.14.1-linux_aarch32hf.tar.gz
-	sha256sums = 1521a4e5f18df362715a171d2be2a553306d573c9b958ec39a366cd8c4b8398f
+	source_armv6h = https://cdn.azul.com/zulu-embedded/bin/zulu11.54.25-ca-jdk11.0.14.1-linux_aarch32hf.tar.gz
+	sha256sums_armv6h = 1521a4e5f18df362715a171d2be2a553306d573c9b958ec39a366cd8c4b8398f
+	source_armv7h = https://cdn.azul.com/zulu-embedded/bin/zulu11.54.25-ca-jdk11.0.14.1-linux_aarch32hf.tar.gz
+	sha256sums_armv7h = 1521a4e5f18df362715a171d2be2a553306d573c9b958ec39a366cd8c4b8398f
+	source_armv8h = https://cdn.azul.com/zulu-embedded/bin/zulu11.54.25-ca-jdk11.0.14.1-linux_aarch32hf.tar.gz
+	sha256sums_armv8h = 1521a4e5f18df362715a171d2be2a553306d573c9b958ec39a366cd8c4b8398f
+	source_aarch64 = https://cdn.azul.com/zulu-embedded/bin/zulu11.54.25-ca-jdk11.0.14.1-linux_.tar.gz
+	sha256sums_aarch64 = b0fb0bc303bb05b5042ef3d0939b9489f4a49a13a2d1c8f03c5d8ab23099454d
+	source_i686 = https://cdn.azul.com/zulu/bin/zulu11.54.25-ca-jdk11.0.14.1-linux_i686.tar.gz
+	sha256sums_i686 = 0627ee047246dec575e919bdc2d6a6c94bf6b8a9b332a9964222bd326c5950d1
+	source_x86_64 = https://cdn.azul.com/zulu/bin/zulu11.54.25-ca-jdk11.0.14.1-linux_x64.tar.gz
+	sha256sums_x86_64 = 60e65d32e38876f81ddb623e87ac26c820465b637e263e8bed1acdecb4ca9be2
 
 pkgname = zulu-embedded-jdk11
diff --git a/PKGBUILD b/PKGBUILD
index 05da9e80b568..e59c3aceb379 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,33 +14,23 @@ depends=('java-runtime-common>=3' 'java-environment-common=3'
          'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'lcms2' 'libnet'
          'freetype2' 'giflib' 'libelf')
 
-case "$CARCH" in
-    armv?h) _arch='aarch32hf'
-        _build=11.54.25
-        sha256sums=('1521a4e5f18df362715a171d2be2a553306d573c9b958ec39a366cd8c4b8398f')
-        source=(${source:-"https://cdn.azul.com/zulu-embedded/bin/zulu${_build}-ca-jdk${pkgver}-linux_${_arch}.tar.gz"})
-        ;;
-    aarch64) _arch='aarch64'
-        _build=11.54.25
-        sha256sums=('b0fb0bc303bb05b5042ef3d0939b9489f4a49a13a2d1c8f03c5d8ab23099454d')
-        source=(${source:-"https://cdn.azul.com/zulu-embedded/bin/zulu${_build}-ca-jdk${pkgver}-linux_${_arch}.tar.gz"})
-        ;;
-    i686) _arch='i686'
-        _build=11.54.25
-        sha256sums=('0627ee047246dec575e919bdc2d6a6c94bf6b8a9b332a9964222bd326c5950d1')
-        source=("https://cdn.azul.com/zulu/bin/zulu${_build}-ca-jdk${pkgver}-linux_i686.tar.gz")
-        ;;
-    x86_64) _arch='x64'
-        _build=11.54.25
-        sha256sums=('60e65d32e38876f81ddb623e87ac26c820465b637e263e8bed1acdecb4ca9be2')
-        source=("https://cdn.azul.com/zulu/bin/zulu${_build}-ca-jdk${pkgver}-linux_x64.tar.gz")
-esac
-
-_archive=${source[0]/.tar.gz/}
-_jvmdir="usr/lib/jvm/zulu-embedded-${pkgver%%.*}"
-
+_build=11.54.25
+source_armv6h=("https://cdn.azul.com/zulu-embedded/bin/zulu${_build}-ca-jdk${pkgver}-linux_aarch32hf.tar.gz")
+sha256sums_armv6h=('1521a4e5f18df362715a171d2be2a553306d573c9b958ec39a366cd8c4b8398f')
+source_armv7h=("https://cdn.azul.com/zulu-embedded/bin/zulu${_build}-ca-jdk${pkgver}-linux_aarch32hf.tar.gz")
+sha256sums_armv7h=('1521a4e5f18df362715a171d2be2a553306d573c9b958ec39a366cd8c4b8398f')
+source_armv8h=("https://cdn.azul.com/zulu-embedded/bin/zulu${_build}-ca-jdk${pkgver}-linux_aarch32hf.tar.gz")
+sha256sums_armv8h=('1521a4e5f18df362715a171d2be2a553306d573c9b958ec39a366cd8c4b8398f')
+source_aarch64=("https://cdn.azul.com/zulu-embedded/bin/zulu${_build}-ca-jdk${pkgver}-linux_aarch64.tar.gz")
+sha256sums_aarch64=('b0fb0bc303bb05b5042ef3d0939b9489f4a49a13a2d1c8f03c5d8ab23099454d')
+source_i686=("https://cdn.azul.com/zulu/bin/zulu${_build}-ca-jdk${pkgver}-linux_i686.tar.gz")
+sha256sums_i686=('0627ee047246dec575e919bdc2d6a6c94bf6b8a9b332a9964222bd326c5950d1')
+source_x86_64=("https://cdn.azul.com/zulu/bin/zulu${_build}-ca-jdk${pkgver}-linux_x64.tar.gz")
+sha256sums_x86_64=('60e65d32e38876f81ddb623e87ac26c820465b637e263e8bed1acdecb4ca9be2')
+
+_jvmdir="usr/lib/jvm/zulu-embedded-11"
 package() {
-    cd "$(basename $_archive)"
+    cd "$(basename *.tar.gz .tar.gz)"
 
     install -dm 755 "${pkgdir}/${_jvmdir}"
     cp -a . "${pkgdir}/${_jvmdir}/"