fix errors

2 files changed, 16 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00bad515eea3..a11654f3efdf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = stackzy-bin
 	pkgdesc = A cross-platform desktop application to identify libraries used inside an android application. Made possible by Compose Desktop
 	pkgver = 1.2.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/theapache64/stackzy
 	arch = x86_64
 	license = Apache
@@ -18,7 +18,7 @@ pkgbase = stackzy-bin
 	depends = zlib
 	provides = stackzy=1.2.6
 	source = stackzy-1.2.6.deb::https://github.com/theapache64/stackzy/releases/download/1.2.6/stackzy_1.2.6-1_amd64.deb
-	source = LICENSE::https://raw.githubusercontent.com/theapache64/stackzy/master/LICENSE
+	source = LICENSE::https://raw.githubusercontent.com/theapache64/stackzy/1.2.6/LICENSE
 	sha256sums = be46f24ab891c1c3007715ceb539b006f281d445743ab77195c7c6f47cafbdeb
 	sha256sums = c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4
 
diff --git a/PKGBUILD b/PKGBUILD
index 73c63903ad50..5210a5eed733 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=stackzy-bin
-_appname=Stackzy
+_pkgname=Stackzy
 pkgver=1.2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform desktop application to identify libraries used inside an android application. Made possible by Compose Desktop"
 arch=('x86_64')
 url="https://github.com/theapache64/stackzy"
@@ -11,14 +11,20 @@ provides=("${pkgname%-bin}=${pkgver}")
 confilcts=("${pkgname%-bin}")
 depends=('libxtst' 'libglvnd' 'fontconfig' 'java-runtime' 'libxrender' 'alsa-lib' 'glibc' 'libxi' 'libxext' 'libx11' 'zlib')
 source=("${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/${pkgver}/${pkgname%-bin}_${pkgver}-1_amd64.deb"
-    "LICENSE::https://raw.githubusercontent.com/theapache64/stackzy/master/LICENSE")
+    "LICENSE::https://raw.githubusercontent.com/theapache64/stackzy/${pkgver}/LICENSE")
 sha256sums=('be46f24ab891c1c3007715ceb539b006f281d445743ab77195c7c6f47cafbdeb'
             'c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4')
+prepare() {
+    bsdtar -xf "${srcdir}/data.tar.zst"
+    rm -rf "${srcdir}/opt/${pkgname%-bin}/lib/app/resources"
+    sed "s|/opt/${pkgname%-bin}/bin/${_pkgname}|${pkgname%-bin}|g;s|/opt/${pkgname%-bin}/lib/${_pkgname}.png|${pkgname%-bin}|g;s|Unknown|Utility;Development;|g" \
+        -i "${srcdir}/opt/${pkgname%-bin}/lib/${pkgname%-bin}-${_pkgname}.desktop"
+}
 package() {
-    bsdtar -xf "${srcdir}/data.tar.zst" -C "${pkgdir}"
-    sed "s|/opt/${pkgname%-bin}/lib/${_appname}.png|${pkgname%-bin}|g;s|Unknown|Utility;Development;|g" \
-        -i "${pkgdir}/opt/${pkgname%-bin}/lib/${pkgname%-bin}-${_appname}.desktop"
-    install -Dm644 "${pkgdir}/opt/${pkgname%-bin}/lib/${pkgname%-bin}-${_appname}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
-    install -Dm644 "${pkgdir}/opt/${pkgname%-bin}/lib/${_appname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
+    install -Dm755 -d "${pkgdir}/"{opt,usr/bin}
+    cp -r "${srcdir}/opt/${pkgname%-bin}" "${pkgdir}/opt"
+    ln -sf "/opt/${pkgname%-bin}/${_pkgname}" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/opt/${pkgname%-bin}/lib/${pkgname%-bin}-${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    install -Dm644 "${srcdir}/opt/${pkgname%-bin}/lib/${_pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
     install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file