update to 7.33.6

3 files changed, 33 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f54e69d4302..750417d88cc7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deepin-wine-welink
 	pkgdesc = 华为数字化办公实践,服务政企、高校等主要客户,是全场景安全、智能、的数字化办公平台,帮助AnyBody、AnyWhere、AnyDevice、doAnyBusiness4A办公。
-	pkgver = 7.32.7.484
+	pkgver = 7.33.6
 	pkgrel = 1
 	url = https://www.huaweicloud.com/product/welink.html
 	install = deepin-wine-welink.install
@@ -13,17 +13,18 @@ pkgbase = deepin-wine-welink
 	optdepends = wqy-microhei
 	optdepends = wqy-zenhei
 	conflicts = welink
+	conflicts = huaweicloudmeeting
 	source = com.huaweicloud.welink.spark_7.21.3.403spark1.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/com.huaweicloud.welink.spark/com.huaweicloud.welink.spark_7.21.3.403spark1_i386.deb
-	source = WeLink-7.32.7.484.exe::https://welink.huaweicloud.com/download/WeLink_setup.exe
+	source = WeLink-7.33.6.exe::https://welink.huaweicloud.com/download/WeLink_setup.exe
 	source = fake_simsun.ttc::https://images.xuthus.cc/images/fake_simsun.ttc
 	source = deepin-wine-welink.install
 	source = LICENSE.html::https://www.huaweicloud.com/declaration/sa_cua_computing.html
 	source = run.sh
 	sha256sums = 2a5046177ad2f57ebeff4176ffe4ae2717eed19c8fd2e84fad5b9f44305d16d1
-	sha256sums = 6364a2a0e7aa18a2428c0727d0789aee2f7687c5e1f9773c7a8d8c36aee4714e
+	sha256sums = 92c6ad40c18373ff4f16ca626aeca801f7945c1b70bb563fb8cf31267e82ddab
 	sha256sums = 3e2ed9203a5ce3b2f00b6c942d8fac6b24e7a6e7b1ebc863cee2e27d3ff487db
 	sha256sums = d3f310b0d94bc630700afec6d0786edc1176ca28def75b518167deba1965288a
-	sha256sums = 2157ab88b3d8fc11c3c6bf4b1cc05ea13bce152bca4091ecf34c755e987ae8cc
-	sha256sums = e89c42be3b544d6f8781e881bef759f8ea8909d8e0ec4c136a9909205c4cc1d3
+	sha256sums = 04e1034593bc78727012888ec91391bf953e80061114c491ef1575bb981d5050
+	sha256sums = a61180b631514e035828c7e7cfcdfb8e785d976b8ca56ea8532248fd8988565c
 
 pkgname = deepin-wine-welink
diff --git a/PKGBUILD b/PKGBUILD
index 7748ffb53f0a..bc3a62c6e0ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
-pkgname=deepin-wine-welink
-_pkgname=com.huaweicloud.welink.spark
+_pkgname=welink
+pkgname="deepin-wine-${_pkgname}"
+_sparkname="com.huaweicloud.${_pkgname}.spark"
 _appname=WeLink
-pkgver=7.32.7.484
+pkgver=7.33.6
 _sparkver=7.21.3.403spark1
 pkgrel=1
 pkgdesc="华为数字化办公实践,服务政企、高校等主要客户,是全场景安全、智能、的数字化办公平台,帮助AnyBody、AnyWhere、AnyDevice、doAnyBusiness4A办公。"
@@ -10,45 +11,47 @@ arch=("x86_64")
 url="https://www.huaweicloud.com/product/welink.html"
 license=('custom')
 depends=('deepin-wine6-stable' 'spark-dwine-helper' 'xdg-utils' 'sh')
+makededpends=('p7zip')
 optdepends=('wqy-microhei' 'wqy-zenhei')
-conflicts=("welink")
+conflicts=("${_pkgname}" "huaweicloudmeeting")
 install="${pkgname}.install"
-source=("${_pkgname}_${_sparkver}.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/${_pkgname}/${_pkgname}_${_sparkver}_i386.deb"
-    "${_appname}-${pkgver}.exe::https://welink.huaweicloud.com/download/WeLink_setup.exe"
+source=("${_sparkname}_${_sparkver}.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/${_sparkname}/${_sparkname}_${_sparkver}_i386.deb"
+    "${_appname}-${pkgver}.exe::https://welink.huaweicloud.com/download/${_appname}_setup.exe"
     "fake_simsun.ttc::https://images.xuthus.cc/images/fake_simsun.ttc"
     "${pkgname}.install"
     "LICENSE.html::https://www.huaweicloud.com/declaration/sa_cua_computing.html"
     "run.sh")
 sha256sums=('2a5046177ad2f57ebeff4176ffe4ae2717eed19c8fd2e84fad5b9f44305d16d1'
-            '6364a2a0e7aa18a2428c0727d0789aee2f7687c5e1f9773c7a8d8c36aee4714e'
+            '92c6ad40c18373ff4f16ca626aeca801f7945c1b70bb563fb8cf31267e82ddab'
             '3e2ed9203a5ce3b2f00b6c942d8fac6b24e7a6e7b1ebc863cee2e27d3ff487db'
             'd3f310b0d94bc630700afec6d0786edc1176ca28def75b518167deba1965288a'
-            '2157ab88b3d8fc11c3c6bf4b1cc05ea13bce152bca4091ecf34c755e987ae8cc'
-            'e89c42be3b544d6f8781e881bef759f8ea8909d8e0ec4c136a9909205c4cc1d3')
-prepare() {
+            '04e1034593bc78727012888ec91391bf953e80061114c491ef1575bb981d5050'
+            'a61180b631514e035828c7e7cfcdfb8e785d976b8ca56ea8532248fd8988565c')
+build() {
     bsdtar -xf "${srcdir}/data.tar.xz"
+    mv "${srcdir}/opt/${_sparkname}" "${srcdir}/opt/${pkgname}"
     mkdir -p "${srcdir}/tmp"
     msg "Extracting Deepin Wine ${_appname} archive ..."
-    7z x -aoa "${srcdir}/opt/apps/${_pkgname}/files/files.7z" -o"${srcdir}/tmp"     
+    7z x -aoa "${srcdir}/opt/apps/${pkgname}/files/files.7z" -o"${srcdir}/tmp"     
     msg "Copying latest ${_appname} installer to ${srcdir}/tmp/drive_c/Program Files/${_appname} ..."
     rm -rf "${srcdir}/tmp/drive_c/Program Files/${_appname}/" "${srcdir}/tmp/drive_c/Program Files (x86)"
     mkdir -p "${srcdir}/tmp/drive_c/Program Files/${_appname}/"
-    install -m644 "${_appname}-${pkgver}.exe" "${srcdir}/tmp/drive_c/Program Files/${_appname}/${_appname}-${pkgver}.exe"
+    install -m644 "${srcdir}/${_appname}-${pkgver}.exe" "${srcdir}/tmp/drive_c/Program Files/${_appname}/${_appname}-${pkgver}.exe"
     cp "${srcdir}/fake_simsun.ttc" "${srcdir}/tmp/drive_c/windows/Fonts/"
     msg "Repackaging app archive ..."
-    rm -r "${srcdir}/opt/apps/${_pkgname}/files/files.7z"
-    7z a -t7z -r "${srcdir}/opt/apps/${_pkgname}/files/files.7z" "${srcdir}/tmp/*"
-    sed "s|chat|Network|g;s|${_pkgname}|${pkgname}|g" -i "${srcdir}/opt/apps/${_pkgname}/entries/applications/${_pkgname}.desktop"
-    sed "s|Icon=/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${pkgname}.png|Icon=${pkgname}|g" \
-        -i "${srcdir}/opt/apps/${_pkgname}/entries/applications/${_pkgname}.desktop"
-    rm -rf "${pkgdir}/opt/apps/${pkgname}/info"
+    rm -r "${srcdir}/opt/apps/${pkgname}/files/files.7z"
+    7z a -t7z -r "${srcdir}/opt/apps/${pkgname}/files/files.7z" "${srcdir}/tmp/*"
+    sed -e "s|chat|Network|g" \
+        -e "s|/opt/apps/${_sparkname}/entries/icons/hicolor/scalable/apps/${_sparkname}.png|${pkgname}|g" \
+        -e "s|\"/opt/apps/${_sparkname}/files/run.sh\"|${pkgname}|g" \
+        -i "${srcdir}/opt/apps/${_sparkname}/entries/applications/${_sparkname}.desktop"
+    rm -rf "${srcdir}/opt/apps/${pkgname}/info"
 }
 package() {
-    install -Dm755 -d "${pkgdir}/opt/apps/${pkgname}"
-    cp -r "${srcdir}/opt/apps/${_pkgname}/"* "${pkgdir}/opt/apps/${pkgname}"
+    cp -r "${srcdir}/opt" "${pkgdir}"
     md5sum "${pkgdir}/opt/apps/${pkgname}/files/files.7z" | awk '{ print $1 }' > "${pkgdir}/opt/apps/${pkgname}/files/files.md5sum"
-    install -Dm644 "${srcdir}/opt/apps/${_pkgname}/entries/applications/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-    install -Dm644 "${srcdir}/opt/apps/${_pkgname}/entries/icons/hicolor/scalable/apps/${_pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-    install -Dm755 "${srcdir}/run.sh" -t "${pkgdir}/opt/apps/${pkgname}/files/"
+    install -Dm644 "${srcdir}/opt/apps/${_sparkname}/entries/applications/${_sparkname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    install -Dm644 "${srcdir}/opt/apps/${_sparkname}/entries/icons/hicolor/scalable/apps/${_sparkname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm755 "${srcdir}/run.sh" "${pkgdir}/usr/bin/${pkgname}"
     install -Dm644 "${srcdir}/LICENSE.html" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/run.sh b/run.sh
index a42721d44b3b..1620d07fdd8b 100644
--- a/run.sh
+++ b/run.sh
@@ -8,7 +8,7 @@
 #               Vufa <countstarlight@gmail.com>
  
 BOTTLENAME="Deepin-WeLink"
-APPVER="7.31.6.476"
+APPVER="7.33.6"
 WELINK_INSTALLER="WeLink"
 WELINK_VER="7.28.8.455"
 WELINK_INSTALLER_PATH="c:/Program Files/WeLink/${WELINK_INSTALLER}-${WELINK_VER}.exe"