uploads

2 files changed, 14 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3abb1a49bbe..1d7da4becf72 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = zw3d-bin
 	pkgdesc = 国内首款支持Linux系统的三维CAD软件
 	pkgver = 2022.26.00
-	pkgrel = 1
+	pkgrel = 2.0
 	url = https://www.zwsoft.cn/product/zw3d/linux
 	arch = x86_64
 	license = unknown
diff --git a/PKGBUILD b/PKGBUILD
index 421a8b985233..e23cd3260e9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,8 @@ _pkgname='zw3d'
 _pkgname_o='com.zwsoft.zw3dpreview'
 pkgver=2022.26.00
 _year=$(echo $pkgver | cut -d '.' -f1)
-pkgrel=1
+##pkgrel
+pkgrel=2.0
 pkgdesc="国内首款支持Linux系统的三维CAD软件"
 arch=('x86_64')
 depends=('libjbig-shared')
@@ -14,7 +15,8 @@ url="https://www.zwsoft.cn/product/zw3d/linux"
 provides=("zw3d")
 options=('!strip')
 source=("${pkgname}-${pkgver}-${arch}.deb::https://download.zwcad.com/zw3d/3d_linux/preview/${_year}/ZW3D-${_year}-Preview-V1_amd64.deb")
-sha512sums=('e9f3c062b4f859dee806ba0fc624ebc6b9f813d2bbfd36092705aff1a7daa35fd69ef3249381ea3392df4cc7f1087b9612d094bd4ea1ad899f0d2665a6ab4203')
+_sha512sums=$(sha512sum ${pkgname}-${pkgver}-${arch}.deb | cut -d ' ' -f 1)
+sha512sums=("${_sha512sums}")
 
 prepare(){
     cd $srcdir
@@ -25,8 +27,8 @@ package(){
     mkdir -p "${pkgdir}"/opt
     mv "${srcdir}"/usr   "${pkgdir}"
     mkdir -p "${pkgdir}"/usr/share/icons/hicolor/scalable/apps
-    mv "${srcdir}"/opt/apps/com.zwsoft.zw3dpreview "${pkgdir}"/opt/com.zwsoft.zw3dpreview
-    mv "${pkgdir}"/opt/com.zwsoft.zw3dpreview/entries/icons/hicolor/scalable/apps/*.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps
+    mv "${srcdir}"/opt/apps/${_pkgname_o} "${pkgdir}"/opt/${_pkgname_o}
+    mv "${pkgdir}"/opt/${_pkgname_o}/entries/icons/hicolor/scalable/apps/*.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps
     
     
     sed -i '5c Exec=zw3d %F'   "$pkgdir/usr/share/applications/${_pkgname_o}.desktop"
@@ -36,14 +38,15 @@ package(){
     mkdir -p "$pkgdir"/usr/bin/
     
     echo '''#!/bin/bash
-run_path="/opt/com.zwsoft.zw3dpreview/files"
+_pkgname_o='com.zwsoft.zw3dpreview'
+run_path="/opt/${_pkgname_o}/files"
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$run_path/lib:$run_path/lib/xlator:$run_path/libqt:$run_path/libqt/plugins/designer:$run_path/lib3rd
-cd /opt/com.zwsoft.zw3dpreview/files
+cd /opt/${_pkgname_o}/files
 
-./zw3d $*s
+./zw3d $*
 
-''' >"$pkgdir"/opt/com.zwsoft.zw3dpreview/zw3d 
-    chmod 0755 "$pkgdir"/opt/com.zwsoft.zw3dpreview/zw3d
+''' >"$pkgdir"/opt/${_pkgname_o}/zw3d 
+    chmod 0755 "$pkgdir"/opt/${_pkgname_o}/zw3d
     
-    ln -s /opt/com.zwsoft.zw3dpreview/zw3d "$pkgdir"/usr/bin/zw3d
+    ln -s /opt/${_pkgname_o}/zw3d "$pkgdir"/usr/bin/zw3d
 }