update to 22.0.2.4

2 files changed, 18 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f0880896d25..25a6193afcd9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = zwcad-bin
 	pkgdesc = ZWSOFT研发的二维CAD软件，可满足看图、审图、打印工作需要
-	pkgver = 2021.1.4523
+	pkgver = 22.0.2.4
 	pkgrel = 1
+	epoch = 1
 	url = https://www.zwcad.com
 	arch = x86_64
 	arch = aarch64
 	license = unknown
 	provides = zwcad
 	options = !strip
-	source_x86_64 = zwcad-bin-2021.1.4523-x86_64.deb::https://download.zwcad.com/zwcad/cad_linux/2021/4523/zwcad_2021.1.4523-1_zh-cn_amd64.deb
-	sha512sums_x86_64 = 1b7a70252c2718bc0d3f93ddc2fda561d8c593c64c9375ef5f20ad6cc2cd36370c9740c60d9715e0df0c37160a12a4ecdc7717ca51d71a058ce48521800a3cfa
-	source_aarch64 = zwcad-bin-2021.1.4523-x86_64.deb::https://download.zwcad.com/zwcad/cad_linux/2021/4523/zwcad_2021.1.4523-1_zh-cn_arm64.deb
-	sha512sums_aarch64 = 9845fcc430883a7586c04c68ab929ca1e71cd68a7e616ae24c1cd269f5231023efb3750a49c5d90739daca53f3d80a950f25057b9512246e32f8868d075d9c65
+	source_x86_64 = zwcad-bin-22.0.2.4-x86_64.deb::https://download.zwcad.com/zwcad/cad_linux/2022/zwcad_22.0.2.4_zh-cn_amd64.deb
+	sha512sums_x86_64 = a78335be694f9a2efd82319356e8e480fd10ee90dd032ad266318697505e54cf88ce1acdd4f71dd0ba7d1b6a26971a164344d90c4b711fbde03e6127e708995a
+	source_aarch64 = zwcad-bin-22.0.2.4-x86_64.deb::https://download.zwcad.com/zwcad/cad_linux/2022/zwcad_22.0.2.4_zh-cn_arm64.deb
+	sha512sums_aarch64 = aeb74a0426497ae8ce176f7c239b9163bb5d997cecffe19b7093bcfde902e471c42c3b79b933ff85eff42c1b9e162ba304ee0d052fc41d3ec336f1c87733cde1
 
 pkgname = zwcad-bin
-
diff --git a/PKGBUILD b/PKGBUILD
index ce536e3a54a5..40957aa96f2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,31 @@
 
 pkgname='zwcad-bin'
 _pkgname='zwcad'
-pkgver=2021.1.4523
-_year=$(echo $pkgver | cut -d '.' -f1)
+pkgver=22.0.2.4
+_year=20${pkgver:0:2}
 pkgrel=1
+epoch=1
 pkgdesc="ZWSOFT研发的二维CAD软件，可满足看图、审图、打印工作需要"
 arch=('x86_64' 'aarch64')
 license=('unknown')
 url="https://www.zwcad.com"
 provides=("zwcad")
 options=('!strip')
-source_x86_64=("${pkgname}-${pkgver}-${arch}.deb::https://download.zwcad.com/zwcad/cad_linux/${_year}/${pkgver:7}/zwcad_${pkgver}-1_zh-cn_amd64.deb")
-sha512sums_x86_64=('1b7a70252c2718bc0d3f93ddc2fda561d8c593c64c9375ef5f20ad6cc2cd36370c9740c60d9715e0df0c37160a12a4ecdc7717ca51d71a058ce48521800a3cfa')
-sha512sums_aarch64=('9845fcc430883a7586c04c68ab929ca1e71cd68a7e616ae24c1cd269f5231023efb3750a49c5d90739daca53f3d80a950f25057b9512246e32f8868d075d9c65')
-
-source_aarch64=("${pkgname}-${pkgver}-${arch}.deb::https://download.zwcad.com/zwcad/cad_linux/${_year}/${pkgver:7}/zwcad_${pkgver}-1_zh-cn_arm64.deb")
+source_x86_64=("${pkgname}-${pkgver}-${arch}.deb::https://download.zwcad.com/zwcad/cad_linux/${_year}/zwcad_${pkgver}_zh-cn_amd64.deb")
+source_aarch64=("${pkgname}-${pkgver}-${arch}.deb::https://download.zwcad.com/zwcad/cad_linux/${_year}/zwcad_${pkgver}_zh-cn_arm64.deb")
+sha512sums_x86_64=('a78335be694f9a2efd82319356e8e480fd10ee90dd032ad266318697505e54cf88ce1acdd4f71dd0ba7d1b6a26971a164344d90c4b711fbde03e6127e708995a')
+sha512sums_aarch64=('aeb74a0426497ae8ce176f7c239b9163bb5d997cecffe19b7093bcfde902e471c42c3b79b933ff85eff42c1b9e162ba304ee0d052fc41d3ec336f1c87733cde1')
 
 prepare(){
     cd $srcdir
-    tar -xJvf data.tar.xz -C "${srcdir}"
+    tar -xJf data.tar.xz -C "${srcdir}"
 }
 
 package(){
     mkdir -p "$pkgdir"/opt
     mv "${srcdir}"/usr   "$pkgdir"
     mkdir -p "${pkgdir}"/usr/share/icons/hicolor/scalable/apps
-    mv "${srcdir}"/opt/ZWSOFT/ZWCAD2021 "${pkgdir}"/opt/zwcad
+    mv "${srcdir}"/opt/ZWSOFT/ZWCAD${_year} "${pkgdir}"/opt/zwcad
     mv "${pkgdir}"/opt/zwcad/Icons/ZWCAD.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps
     
     
@@ -38,14 +38,15 @@ package(){
     mkdir -p "$pkgdir"/usr/bin/
     
     echo '''#!/bin/bash
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/zwcad:/opt/zwcad/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/zwcad:/opt/zwcad/lib:/opt/zwcad/lib/mono/lib
+export MONO_PATH=$MONO_PATH:/opt/zwcad/lib/mono/lib/mono/4.5
 export QT_IM_MODULE=fcitx
 export QT_QPA_PLATFORM_PLUGIN_PATH=/opt/zwcad/plugins
 export QT_PLUGIN_PATH=/opt/zwcad/plugins
 export QT_QPA_PLATFORM=xcb
 cd /opt/zwcad/
 #./ZWCAD -platformpluginpath /opt/zwcad/plugins -platform xcb "$1"
-./ZWCAD "$1"
+./ZWCAD "$1" "$2"
 
 ''' >"$pkgdir"/opt/zwcad/zwcad 
     chmod 0755 "$pkgdir"/opt/zwcad/zwcad