From 7522b545ec3eb5ca8a80fc5498bb36385ecc7c2e Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Wed, 6 Nov 2019 04:12:34 +0700
Subject: [PATCH] 13.0.1+9

---
 makefile                |  7 ++-----
 package.properties      |  2 +-
 release/get-java.sh     |  2 +-
 release/get-java.sh.asc | 28 ++++++++++++++--------------
 syno.json               | 10 +++++-----
 5 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/makefile b/makefile
index e33fa65..a990411 100644
--- a/makefile
+++ b/makefile
@@ -5,8 +5,5 @@ update:
 	$(ANT) update-jdk
 	$(ANT) build
 
-spk:
-	$(ANT) clean spk syno-repo
-
-qpkg:
-	$(ANT) clean qpkg
+pkg:
+	$(ANT) clean spk syno-repo qpkg
diff --git a/package.properties b/package.properties
index 6e8498c..210ef04 100644
--- a/package.properties
+++ b/package.properties
@@ -1,5 +1,5 @@
 package: java-installer
-version: 1.9
+version: 2.13
 maintainer: rednoah@filebot.net
 
 title: Java Installer
diff --git a/release/get-java.sh b/release/get-java.sh
index 0ef50aa..577ad99 100755
--- a/release/get-java.sh
+++ b/release/get-java.sh
@@ -80,7 +80,7 @@ fi
 
 
 # verify archive via SHA-256 checksum
-JDK_SHA256_ACTUAL=`openssl dgst -sha256 -hex "$JDK_TAR_GZ" | egrep -o "[a-f0-9]{64}"`
+JDK_SHA256_ACTUAL=`openssl dgst -sha256 -hex "$JDK_TAR_GZ" | awk '{print $NF}'`
 echo "Expected SHA256 checksum: $JDK_SHA256"
 echo "Actual SHA256 checksum: $JDK_SHA256_ACTUAL"
 
diff --git a/release/get-java.sh.asc b/release/get-java.sh.asc
index 3c8c869..3ab4c31 100644
--- a/release/get-java.sh.asc
+++ b/release/get-java.sh.asc
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQJIBAABCAAyFiEEsJduUeXAR60P0FEpTkAuv3w8anEFAl29HzoUHHJlZG5vYWhA
-ZmlsZWJvdC5uZXQACgkQTkAuv3w8anErExAAprq3mzHfj4VMpzazzHUr3zhyyw4D
-ZEnDB4l2kWHGUiNNq+tyGds6yO44jez+8BBbISXfaHpwDXYZ/Gb2lsSFsDC1Q+AW
-m+1tBiuW0PCiBseJO73G/yyqZrhSw2QapGXXbQ/QX1QPc6if5PmeEvNBRAIIzIdA
-6lz+rUX4jACl5XIpB7r+mvzHaZDEgJZbM+/GG3uk8wzeO8K2jfB0C8tcCUgK0Txk
-f/oZ9alf3cX3GmaGpcCOPW0zxiGKmLrhXImy+KyrEU72w6tQESIpQKs7xP6qvlgN
-L/nijWlG7r4mHZYZiIJW2QDihbm1+4uk6/pbVU9EVJeQm2fna64CKS7p8M/TX/6T
-OGhJAihXr9MgMadxQICJBq48JWYsoOWyC3RAl1zGqQaGGdQfuNL5MVUBrW+1+9zp
-VH6KuUlW8OfNqomFSyXUPeYguzt41pMtcRgHVA7kDRRsSw81mHhMe+BWCoF92TUq
-oUhloMjyykGJu43PXNB/L9uU10DmG2oEQto+lcx14+Uf2gw2k20ETEQWu0m+2+sT
-qpQnJXRHq2C1ypxzH7Cvy1gw6N3rup2+m+KvHegdKn/4EpTpXsvSx5NSIQFAqztH
-jNa6gmxKQHnjeBepYyRPJ71Whwhu7YU/aUrrYKBhphkDOl6XkccSPJExHnd3zXDu
-3qeYNEKlgK0Kju8=
-=jimb
+iQJIBAABCAAyFiEEsJduUeXAR60P0FEpTkAuv3w8anEFAl3B4QIUHHJlZG5vYWhA
+ZmlsZWJvdC5uZXQACgkQTkAuv3w8anFegRAAmnJr80pmRPNiKzYCeL0FCDiscLMV
+K97Rwlyd7DcEoXiItx0u6v2a48eMPFZPEBg/yA6PUG3C8FKh4r1zGDEUJvstHfKY
+8fjyUBMDT6peB5Rlxx9fKvTsz/kl1LSYatV0ld2ckdnGKCt6e8MVbZH8ufmqZsLE
+2a4nAkFwdSXVMet9zpOhWv+J0t8iakCJaouL/au0a4HMQ/DE7GAtfrJFx2NjGVRk
+WyR9rdfSA8SodE+XyqaIXFMim1AfHveHydxf6OZKnPGY1skbhUYbUbVEPX4vV9NS
+j2uGzjxAAdUzVN5hqczdoR1rKZ8k03GWIKDqnzPWDFxTULc86oJMmeM76KitO+ek
+EWujQPA1Qas/PADAh7xU5auUtrzX/w5LpopV0pRLiXkAhlqAmnLpfZssBrDogf19
+RNnOwNgEjDaRkip/Tif3zvRJ+7hhaHfyf0+2L+bUOVxS/jhTOnOPeiBmz3QHXpRW
+ToKEIdvX9cSININkVJrR5tv0IGqYQMzKIrtFmicjx9RK1/JDMlfJ9NyjXcY8CVnS
+8D497a1dCrEMHmeUwfMMAks9nSDW7HEJqpHdHvDCYmarJ0KF1rtxzIAbhJ2Un7rE
+oCb5rzg+eDm1ZtLdjazPIImwpT4MkBnJIC7frcg8mi/EsZGzKghej+wFXwJGVWgB
+z6Gf39GeFyAB3C0=
+=bZrP
 -----END PGP SIGNATURE-----
diff --git a/syno.json b/syno.json
index 44f537f..f44cfee 100644
--- a/syno.json
+++ b/syno.json
@@ -5,7 +5,7 @@
     "packages":[
         {
             "package":"java-installer",
-            "version":"1.9",
+            "version":"2.13",
             "dname":"Java Installer",
             "desc":"Java Installer will help you install and update Java. Supported platforms include armv7l, aarch64, i586 and x86_64 models. During the install, this package will download the latest OpenJDK binaries (180 MB) for your platform. This may take a while.",
             "maintainer":"rednoah",
@@ -19,10 +19,10 @@
             "thumbnail":[
                 "https://raw.githubusercontent.com/rednoah/java-installer/master/package/synology/images/thumb_256.png"
             ],
-            "link":"https://github.com/rednoah/java-installer/releases/download/1.9/java-installer-1.9-noarch.spk",
-            "download_count":"25666",
-            "md5":"666778e63e0fca6392925f5de35fb7f7",
-            "sha256":"c61a11e38b964fc6cd584c1af12b2d103cfbd85b40d9ba8dd055d3fefc76381c",
+            "link":"https://github.com/rednoah/java-installer/releases/download/2.13/java-installer-2.13-noarch.spk",
+            "download_count":"28549",
+            "md5":"63aa93f6f4cb59fb6466678794529995",
+            "sha256":"f2edc8c9bd1f0f5db015b81bd133e77ba6ce3813c6519c10f4bb052624781e4f",
             "size":40960
         }
     ]