update to 1.8.1

2 files changed, 29 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50d55130beb8..dbd263801c02 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = jd-tool-bin
 	pkgdesc = JSON diff and patch
-	pkgver = 1.7.1
+	pkgver = 1.8.1
 	pkgrel = 1
 	url = https://github.com/josephburnett/jd
-	arch = x86_64
 	arch = aarch64
+	arch = x86_64
 	license = MIT
-	provides = jd-tool
+	provides = jd-tool=1.8.1
 	conflicts = jd-tool
-	source = jd-tool-bin-1.7.1-LICENSE::https://raw.githubusercontent.com/josephburnett/jd/v1.7.1/LICENSE
+	source = LICENSE-1.8.1::https://raw.githubusercontent.com/josephburnett/jd/v1.8.1/LICENSE
 	sha256sums = 7db445fe94ae6fb0c5ab69a6b47ec38a0e4b6d5a38f9d1493c0d8cb7c8ad2516
-	source_x86_64 = jd-tool-bin-1.7.1::https://github.com/josephburnett/jd/releases/download/v1.7.1/jd-amd64-linux
-	sha256sums_x86_64 = 4cdc29dee2f510de8fbaf8743b845a10198179dd19cbe935fba8814658a8ef92
-	source_aarch64 = jd-tool-bin-1.7.1::https://github.com/josephburnett/jd/releases/download/v1.7.1/jd-arm64-linux
-	sha256sums_aarch64 = 12aee4b3e0ce52d6b370fb17789d28522ea09ccdcd47c7cdda8b4ba3bab47e79
+	source_aarch64 = jd-tool-bin-1.8.1-aarch64::https://github.com/josephburnett/jd/releases/download/v1.8.1/jd-arm64-linux
+	sha256sums_aarch64 = 670b8ad5df0087061d50417223f6400c4e507f0631b599c9479ae5f6f497e861
+	source_x86_64 = jd-tool-bin-1.8.1-x86_64::https://github.com/josephburnett/jd/releases/download/v1.8.1/jd-amd64-linux
+	sha256sums_x86_64 = ab918f52130561abd4f88d9c2d3ae95d4d56f1a2dff9762665890349d61c763e
 
 pkgname = jd-tool-bin
diff --git a/PKGBUILD b/PKGBUILD
index 7028dc7e0523..e5f45a708af4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,29 @@
+# Contributor: zxp19821005 <zxp19821005 at 163 dot com>
 # Maintainer: Carl Smedstad <carl.smedstad at protonmail dot com>
 # Contributor: Radoslaw Mejer <radmen@radmen.info>
-
-pkgname=jd-tool-bin
 _pkgname=jd
-pkgver=1.7.1
+pkgname="${_pkgname}-tool-bin"
+pkgver=1.8.1
 pkgrel=1
 pkgdesc="JSON diff and patch"
-arch=(x86_64 aarch64)
+arch=(
+    'aarch64'
+    'x86_64'
+)
 url="https://github.com/josephburnett/jd"
-license=(MIT)
-provides=(jd-tool)
-conflicts=(jd-tool)
-
-source=("$pkgname-$pkgver-LICENSE::https://raw.githubusercontent.com/josephburnett/$_pkgname/v$pkgver/LICENSE")
-source_aarch64=("$pkgname-$pkgver::$url/releases/download/v$pkgver/$_pkgname-arm64-linux")
-source_x86_64=("$pkgname-$pkgver::$url/releases/download/v$pkgver/$_pkgname-amd64-linux")
-
+license=('MIT')
+provides=("${pkgname%-bin}=${pkgver}")
+conflicts=("${pkgname%-bin}")
+depends=()
+source=(
+    "LICENSE-${pkgver}::https://raw.githubusercontent.com/josephburnett/jd/v${pkgver}/LICENSE"
+)
+source_aarch64=("${pkgname}-${pkgver}-aarch64::${url}/releases/download/v${pkgver}/${_pkgname}-arm64-linux")
+source_x86_64=("${pkgname}-${pkgver}-x86_64::${url}/releases/download/v${pkgver}/${_pkgname}-amd64-linux")
 sha256sums=('7db445fe94ae6fb0c5ab69a6b47ec38a0e4b6d5a38f9d1493c0d8cb7c8ad2516')
-sha256sums_x86_64=('4cdc29dee2f510de8fbaf8743b845a10198179dd19cbe935fba8814658a8ef92')
-sha256sums_aarch64=('12aee4b3e0ce52d6b370fb17789d28522ea09ccdcd47c7cdda8b4ba3bab47e79')
-
+sha256sums_aarch64=('670b8ad5df0087061d50417223f6400c4e507f0631b599c9479ae5f6f497e861')
+sha256sums_x86_64=('ab918f52130561abd4f88d9c2d3ae95d4d56f1a2dff9762665890349d61c763e')
 package() {
-  install -Dm755 "$srcdir/$pkgname-$pkgver" "$pkgdir/usr/bin/jd"
-  install -Dm644 "$srcdir/$pkgname-$pkgver-LICENSE" "$pkgdir/usr/share/licenses/jd/LICENSE"
-}
+    install -Dm755 "${srcdir}/${pkgname}-${pkgver}-${CARCH}" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/LICENSE-${pkgver}" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
\ No newline at end of file