fix errors

2 files changed, 22 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5bc4e815bd04..c9f40586904d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gstarcad-bin
 	pkgdesc = 浩辰 CAD.Free trial for 30 days
 	pkgver = 23.1.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.gstarcad.com/cad_linux/
 	arch = aarch64
 	arch = armv7h
@@ -40,6 +40,7 @@ pkgbase = gstarcad-bin
 	depends = libdrm
 	provides = gstarcad=23.1.1
 	conflicts = gstarcad
+	options = !strip
 	source_aarch64 = gstarcad-23.1.1-aarch64.deb::https://hccad.gstarcad.cn/linux2023/v3.0/v23.1.1/deb/gstarcad_23.1.1_arm64.deb
 	sha256sums_aarch64 = 29de9bb281ada1a1f22e4b15b8e05e4ff1a588873b0f86b64e28db287d2c77f2
 	source_armv7h = gstarcad-23.1.1-armv7h.deb::https://hccad.gstarcad.cn/linux2023/v3.0/v23.1.1/deb/gstarcad_23.1.1_arm64.deb
diff --git a/PKGBUILD b/PKGBUILD
index c582b80ee68f..5b3ffcb03ac2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,14 @@
 pkgname=gstarcad-bin
 _appname="com.${pkgname%-bin}.cad"
 pkgver=23.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="浩辰 CAD.Free trial for 30 days"
 arch=('aarch64' 'armv7h' 'x86_64')
 license=('custom')
 url="https://www.gstarcad.com/cad_linux/"
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
+options=('!strip')
 depends=('sh' 'libxxf86vm' 'libsm' 'hicolor-icon-theme' 'libxkbcommon' 'xcb-util-image' 'xdg-utils' 'xcb-util-keysyms' \
     'fontconfig' 'libcups' 'xcb-util-wm' 'libice' 'xcb-util-renderutil' 'qt5-base' 'freetype2' 'libxfixes' 'libxext' \
     'libxcb' 'gcc-libs' 'expat' 'mesa' 'libxdamage' 'libx11' 'zlib' 'systemd-libs' 'libxshmfence' 'qt5-svg' \
@@ -20,7 +21,23 @@ source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::https://hccad.gstarcad.cn/
 sha256sums_aarch64=('29de9bb281ada1a1f22e4b15b8e05e4ff1a588873b0f86b64e28db287d2c77f2')
 sha256sums_armv7h=('29de9bb281ada1a1f22e4b15b8e05e4ff1a588873b0f86b64e28db287d2c77f2')
 sha256sums_x86_64=('fe5abf637b282efe0822670e4bea11c6655b502a28b9132cdbfd10ce4d63f62a')
+prepare(){
+    bsdtar -xf "${srcdir}/data.tar.xz"
+    sed "s|bash /opt/apps/${pkgname%-bin}/v2023/files/gclauncher.sh %F|bash ${pkgname%-bin} %F|g" \
+        -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    sed "s|/usr/share/icons/hicolor/scalable/apps/${pkgname%-bin}.svg|${pkgname%-bin}|g" \
+        -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    sed "s|/usr/bin/mate-terminal -x /opt/apps/gstarcad/v2023/linux/gcad_uninstall.sh|bash -x ${pkgname%-bin}-uninstall|g" \
+        -i "${srcdir}/usr/share/applications/${pkgname%-bin}-uninstall.desktop"
+    sed "s|/usr/share/icons/hicolor/scalable/apps/${pkgname%-bin}.svg|${pkgname%-bin}|g" \
+        -i "${srcdir}/usr/share/applications/${pkgname%-bin}-uninstall.desktop"
+}
 package(){
-    bsdtar -xf "${srcdir}/data.tar.xz" -C "${pkgdir}" --gname root --uname root
-    install -Dm644 "${pkgdir}/opt/apps/${pkgname%-bin}/v2023/files/Licenses/"* -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm755 -d "${pkgdir}/"{opt/apps,usr/bin}
+    cp -r "${srcdir}/opt/apps/${pkgname%-bin}" "${pkgdir}/opt/apps"
+    ln -sf "/opt/apps/${pkgname%-bin}/v2023/files/gclauncher.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    ln -sf "/opt/apps/gstarcad/v2023/linux/gcad_uninstall.sh" "${pkgdir}/usr/bin/${pkgname%-bin}-uninstall"
+    install -Dm644 "${srcdir}/usr/share/applications/"*.desktop -t "${pkgdir}/usr/share/applications"
+    install -Dm644 "${srcdir}/usr/share/icons/hicolor/scalable/apps/${pkgname%-bin}.svg" -t "${pkgdir}/usr/share/icons/hicolor/scalable/apps"
+    install -Dm644 "${srcdir}/opt/apps/${pkgname%-bin}/v2023/files/Licenses/"* -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file