Updated major Java version to 10 and added new variables

2 files changed, 39 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b65e152b2ff..4f524b8a4260 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,22 @@
-pkgbase = jdk9-openj9-bin
-	pkgdesc = Eclipse (former IBM) OpenJ9 with openjdk9
-	pkgver = 9.181
-	pkgrel = 2
-	url = https://adoptopenjdk.net/index.html?variant=openjdk9-openj9
+pkgbase = jdk10-openjdk-openj9-bin
+	pkgdesc = Eclipse (former IBM) OpenJ9 with openjdk10
+	pkgver = 10.0.2.u13
+	pkgrel = 1
+	url = https://adoptopenjdk.net/releases.html?variant=openjdk10&jvmVariant=openj9#x64_linux
 	arch = x86_64
 	license = custom
 	makedepends = coreutils
 	makedepends = bash
+	makedepends = wget
 	depends = java-environment-common
 	depends = ca-certificates-utils
 	depends = nss
-	provides = java-environment=9
-	provides = java-runtime=9
-	provides = java-runtime-headless=9
-	noextract = OpenJDK9-OPENJ9_x64_Linux_jdk-9.181.tar.gz
-	source = https://github.com/AdoptOpenJDK/openjdk9-openj9-releases/releases/download/jdk-9%2B181/OpenJDK9-OPENJ9_x64_Linux_jdk-9.181.tar.gz
-	sha256sums = e0d31d25adb81005eea1ad1095f8d48c1df9da02c39d4b02b201c55f8bb4dca3
+	provides = java-environment=10
+	provides = java-runtime=10
+	provides = java-runtime-headless=10
+	noextract = OpenJDK10-OPENJ9_x64_Linux_jdk-10.0.2.u13_openj9-0.2%2B13.tar.gz
+	source = https://github.com/AdoptOpenJDK/openjdk10-openj9-releases/releases/download/jdk-10.0.2%2B13_openj9-0.9.0/OpenJDK10-OPENJ9_x64_Linux_jdk-10.0.2.13_openj9-0.9.0.tar.gz
+	sha256sums = 1ef0dab3853b2f3666091854ef8149fcb85970254558d5d62cfa9446831779d1
 
-pkgname = jdk9-openj9-bin
+pkgname = jdk10-openjdk-openj9-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 89c0ef046605..7b0fb33d717b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,41 @@
-pkgname=jdk9-openj9-bin
-_pkgver_minor="181"
-pkgver=9.${_pkgver_minor}
-pkgrel=2
-pkgdesc="Eclipse (former IBM) OpenJ9 with openjdk9"
+# Maintainer: WFCody
+# Contributor: Myrddin
+pkgname=jdk10-openjdk-openj9-bin
+_pkgver_minor="0.2.13"
+_pkgver_split="0.2"
+_pkgver_build="13"
+_pkgver_minweb="0.2%2B13"
+_openj_ver="0.9.0"
+_majver_java="10"
+pkgver=${_majver_java}.${_pkgver_split}.u${_pkgver_build}
+_pkgsum_name="OpenJDK${_majver_java}-OPENJ9_x64_Linux_jdk-${pkgver}_openj9-${_openj_ver}.sha256.txt"
+_pkgsum_sha256="wget -q https://github.com/AdoptOpenJDK/openjdk10-openj9-releases/releases/download/jdk-${_majver_java}.${_pkgver_minweb}_openj9-${_openj_ver}/${_pkgsum_name} && cut -d' ' -f1 ${_pkgsum_name}"
+pkgrel=1
+pkgdesc="Eclipse (former IBM) OpenJ9 with openjdk10"
 arch=('x86_64')
-url="https://adoptopenjdk.net/index.html?variant=openjdk9-openj9"
+url="https://adoptopenjdk.net/releases.html?variant=openjdk10&jvmVariant=openj9#x64_linux"
 license=('custom')
 depends=('java-environment-common' 'ca-certificates-utils' 'nss')
 provides=(
-'java-environment=9'
-'java-runtime=9'
-'java-runtime-headless=9'
+'java-environment=10'
+'java-runtime=10'
+'java-runtime-headless=10'
 )
-makedepends=('coreutils' 'bash')
-source=("https://github.com/AdoptOpenJDK/openjdk9-openj9-releases/releases/download/jdk-9%2B${_pkgver_minor}/OpenJDK9-OPENJ9_x64_Linux_jdk-${pkgver}.tar.gz")
-noextract=("OpenJDK9-OPENJ9_x64_Linux_jdk-${pkgver}.tar.gz")
+makedepends=('coreutils' 'bash' 'wget')
+source=("https://github.com/AdoptOpenJDK/openjdk10-openj9-releases/releases/download/jdk-${_majver_java}.${_pkgver_minweb}_openj9-${_openj_ver}/OpenJDK${_majver_java}-OPENJ9_x64_Linux_jdk-${_majver_java}.${_pkgver_minor}_openj9-${_openj_ver}.tar.gz")
+noextract=("OpenJDK${_majver_java}-OPENJ9_x64_Linux_jdk-${pkgver}_openj9-${_pkgver_minweb}.tar.gz")
 # https://github.com/AdoptOpenJDK/openjdk9-openj9-releases/releases/download/jdk-9%2B181/OpenJDK9-OPENJ9_x64_Linux_jdk-9.181.sha256.txt
-# extract automatically?
-sha256sums=('e0d31d25adb81005eea1ad1095f8d48c1df9da02c39d4b02b201c55f8bb4dca3')
+# extract automatically? [bash -c "${_pkgsum_sha256}"] Could this work?
+sha256sums=('1ef0dab3853b2f3666091854ef8149fcb85970254558d5d62cfa9446831779d1')
 
 package() {
     cd "$srcdir"
     
     mkdir -p "${pkgdir}/usr/lib/jvm/"
-    tar -xf OpenJDK9-OPENJ9_x64_Linux_jdk-${pkgver}.tar.gz -C "${pkgdir}/usr/lib/jvm/"
-    mv "${pkgdir}/usr/lib/jvm/jdk-9+${_pkgver_minor}" "${pkgdir}/usr/lib/jvm/java-9-j9"
+    tar -xf OpenJDK${_majver_java}-OPENJ9_x64_Linux_jdk-${_majver_java}.${_pkgver_minor}_openj9-${_openj_ver}.tar.gz -C "${pkgdir}/usr/lib/jvm/"
+    mv "${pkgdir}/usr/lib/jvm/jdk-${_majver_java}.${_pkgver_split}+${_pkgver_build}" "${pkgdir}/usr/lib/jvm/java-${_majver_java}-j9"
     mkdir -p "${pkgdir}/usr/share/licenses"
-    ln -s "/usr/lib/jvm/java-9-j9/legal" "${pkgdir}/usr/share/licenses/java-9-j9"
+    ln -s "/usr/lib/jvm/java-${_majver_java}-j9/legal" "${pkgdir}/usr/share/licenses/java-${_majver_java}-j9"
     
 }