fix errors

2 files changed, 18 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 765aa815dfb3..d6ceaf7014b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = kui-bin
 	pkgdesc = A hybrid command-line/UI development experience for cloud-native development
 	pkgver = 13.1.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/kubernetes-sigs/kui
 	arch = aarch64
 	arch = x86_64
 	license = Apache
+	makedepends = gendesk
 	depends = libdrm
 	depends = glibc
 	depends = alsa-lib
@@ -31,8 +32,8 @@ pkgbase = kui-bin
 	depends = expat
 	depends = glib2
 	depends = cairo
+	provides = kui=13.1.4
 	conflicts = kui
-	noextract = kui-13.1.4-x86_64.zip
 	source_aarch64 = kui-13.1.4-aarch64.zip::https://github.com/kubernetes-sigs/kui/releases/download/v13.1.4/Kui-linux-arm64.zip
 	sha256sums_aarch64 = 2138d7b605fb9cc0a28a7bceaa071b7b70a6a8f009110e34eeb6ec4aa0772c85
 	source_x86_64 = kui-13.1.4-x86_64.zip::https://github.com/kubernetes-sigs/kui/releases/download/v13.1.4/Kui-linux-x64.zip
diff --git a/PKGBUILD b/PKGBUILD
index 3b5ad45a4d8a..1d2efe8135cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,30 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=kui-bin
-_appname=Kui
+_pkgname=Kui
 pkgver=13.1.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A hybrid command-line/UI development experience for cloud-native development"
 arch=('aarch64' 'x86_64')
 url="https://github.com/kubernetes-sigs/kui"
 license=('Apache')
+conflicts=("${pkgname%-bin}")
+provides=("${pkgname%-bin}=${pkgver}")
 depends=('libdrm' 'glibc' 'alsa-lib' 'libx11' 'pango' 'libxcomposite' 'dbus' 'mesa' 'hicolor-icon-theme' 'libxdamage' 'libxfixes' 'nspr' \
     'at-spi2-core' 'libcups' 'libxkbcommon' 'bash' 'gcc-libs' 'gtk3' 'nss' 'libxext' 'libxrandr' 'libxcb' 'expat' 'glib2' 'cairo')
-conflicts=("${pkgname%-bin}")
-source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.zip::${url}/releases/download/v${pkgver}/${_appname}-linux-arm64.zip")
-source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.zip::${url}/releases/download/v${pkgver}/${_appname}-linux-x64.zip")
-noextract=("${pkgname%-bin}-${pkgver}-${CARCH}.zip")
+makedepends=('gendesk')
+source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.zip::${url}/releases/download/v${pkgver}/${_pkgname}-linux-arm64.zip")
+source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.zip::${url}/releases/download/v${pkgver}/${_pkgname}-linux-x64.zip")
 sha256sums_aarch64=('2138d7b605fb9cc0a28a7bceaa071b7b70a6a8f009110e34eeb6ec4aa0772c85')
 sha256sums_x86_64=('ebdf87c7746e82d3464f5dbeae98629a9aaff94da69d817fbd9307f44ebf9a36')
+prepare() {
+    gendesk -f -n --categories "Development" --name "${_pkgname}" --exec "${pkgname%-bin} --no-sandbox %U"
+}
 package() {
-    install -Dm755 -d "${pkgdir}/opt"
-    bsdtar -xf "${srcdir}/${pkgname%-bin}-${pkgver}-${CARCH}.zip" -C "${pkgdir}/opt" --gname root --uname root
-    mv "${pkgdir}/opt/${_appname}-linux-x64" "${pkgdir}/opt/${pkgname%-bin}"
-    install -Dm644 "${pkgdir}/opt/${pkgname%-bin}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -Dm644 "${pkgdir}/opt/${pkgname%-bin}/resources/app/node_modules/@${pkgname%-bin}-shell/build/icons/svg/${pkgname%-bin}.svg" \
+    install -Dm755 -d "${pkgdir}/"{opt/"${pkgname%-bin}",usr/bin}
+    cp -r "${srcdir}/${_pkgname}-linux-"*/* "${pkgdir}/opt/${pkgname%-bin}"
+    ln -sf "/opt/${pkgname%-bin}/${_pkgname}" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/${_pkgname}-linux-"*/LICENSE* -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/${_pkgname}-linux-"*/resources/app/node_modules/"@${pkgname%-bin}-shell/build/icons/svg/${pkgname%-bin}.svg" \
         -t "${pkgdir}/usr/share/icons/hicolor/scalable/apps"
-    gendesk -f -n --icon "${pkgname%-bin}" --categories "Development" --name "${_appname}" --exec "/opt/${pkgname%-bin}/${_appname} %U"
     install -Dm644 "${srcdir}/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
 }
\ No newline at end of file