update to 7.35.3.499

3 files changed, 21 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48f4919b4758..48b3ec4b3f78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deepin-wine-welink
 	pkgdesc = 华为数字化办公实践,服务政企、高校等主要客户,是全场景安全、智能、的数字化办公平台,帮助AnyBody、AnyWhere、AnyDevice、doAnyBusiness4A办公。
-	pkgver = 7.34.7.494
+	pkgver = 7.35.3.499
 	pkgrel = 1
 	url = https://www.huaweicloud.com/product/welink.html
 	install = deepin-wine-welink.install
@@ -9,22 +9,21 @@ pkgbase = deepin-wine-welink
 	depends = deepin-wine6-stable
 	depends = spark-dwine-helper
 	depends = xdg-utils
-	depends = sh
 	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.34.7.494.exe::https://welink.huaweicloud.com/download/WeLink_setup.exe
+	source = deepin-wine-welink_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.35.3.499.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 = deepin-wine-welink.sh
 	sha256sums = 2a5046177ad2f57ebeff4176ffe4ae2717eed19c8fd2e84fad5b9f44305d16d1
-	sha256sums = 61e9ba5c507910515aceecb53b48faa736282cbd795456e81484f831ea933ddc
+	sha256sums = 6e1eeb066c44fe1c62ee4d8760b670683ea3ec92ef1fc2fff360e4c59f6ec299
 	sha256sums = 3e2ed9203a5ce3b2f00b6c942d8fac6b24e7a6e7b1ebc863cee2e27d3ff487db
 	sha256sums = d3f310b0d94bc630700afec6d0786edc1176ca28def75b518167deba1965288a
-	sha256sums = 8870de1e48191faf4312f01d0478816ae6e69992e3e4b5b90ac2c3bac8a85060
-	sha256sums = 2c45cb8522c79d8746aa987869753e34723a39073e0eebb45900880c8f168daa
+	sha256sums = 2b9f10db4e21c25c7a0564c9838051743c1bc2517aec6daca903bb078bace486
+	sha256sums = 25d9052271482c2ca80d45909e4fb0e0ed4bd53d06ee727217d8afdcf6df3224
 
 pkgname = deepin-wine-welink
diff --git a/PKGBUILD b/PKGBUILD
index b63142bb07da..3962ffbfd3fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ _pkgname=welink
 pkgname="deepin-wine-${_pkgname}"
 _sparkname="com.huaweicloud.${_pkgname}.spark"
 _appname=WeLink
-pkgver=7.34.7.494
+pkgver=7.35.3.499
 _sparkver=7.21.3.403spark1
 pkgrel=1
 pkgdesc="华为数字化办公实践,服务政企、高校等主要客户,是全场景安全、智能、的数字化办公平台,帮助AnyBody、AnyWhere、AnyDevice、doAnyBusiness4A办公。"
@@ -14,7 +14,6 @@ depends=(
     'deepin-wine6-stable'
     'spark-dwine-helper'
     'xdg-utils'
-    'sh'
 )
 makededpends=(
     'p7zip'
@@ -29,7 +28,7 @@ conflicts=(
 )
 install="${pkgname}.install"
 source=(
-    "${_sparkname}_${_sparkver}.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/${_sparkname}/${_sparkname}_${_sparkver}_i386.deb"
+    "${pkgname}_${_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"
@@ -37,12 +36,13 @@ source=(
     "${pkgname}.sh"
 )
 sha256sums=('2a5046177ad2f57ebeff4176ffe4ae2717eed19c8fd2e84fad5b9f44305d16d1'
-            '61e9ba5c507910515aceecb53b48faa736282cbd795456e81484f831ea933ddc'
+            '6e1eeb066c44fe1c62ee4d8760b670683ea3ec92ef1fc2fff360e4c59f6ec299'
             '3e2ed9203a5ce3b2f00b6c942d8fac6b24e7a6e7b1ebc863cee2e27d3ff487db'
             'd3f310b0d94bc630700afec6d0786edc1176ca28def75b518167deba1965288a'
-            '8870de1e48191faf4312f01d0478816ae6e69992e3e4b5b90ac2c3bac8a85060'
-            '2c45cb8522c79d8746aa987869753e34723a39073e0eebb45900880c8f168daa')
+            '2b9f10db4e21c25c7a0564c9838051743c1bc2517aec6daca903bb078bace486'
+            '25d9052271482c2ca80d45909e4fb0e0ed4bd53d06ee727217d8afdcf6df3224')
 build() {
+    sed "s|@appname@|${pkgname}|g;s|@sparkver@|${_sparkver%spark1}|g;s|@appver@|${pkgver}|g" -i "${srcdir}/${pkgname}.sh"
     bsdtar -xf "${srcdir}/data.tar.xz"
     mv "${srcdir}/opt/apps/${_sparkname}" "${srcdir}/opt/apps/${pkgname}"
     mkdir -p "${srcdir}/tmp"
diff --git a/deepin-wine-welink.sh b/deepin-wine-welink.sh
index 8b670c2302c7..9a5bf1afb987 100644
--- a/deepin-wine-welink.sh
+++ b/deepin-wine-welink.sh
@@ -8,16 +8,16 @@
 #               Vufa <countstarlight@gmail.com>
  
 BOTTLENAME="Deepin-WeLink"
-APPVER="7.34.7.494"
+APPVER=@sparkver@
 WELINK_INSTALLER="WeLink"
-WELINK_VER="7.28.8.455"
+WELINK_VER=@appver@
 WELINK_INSTALLER_PATH="c:/Program Files/WeLink/${WELINK_INSTALLER}-${WELINK_VER}.exe"
 WINEPREFIX="$HOME/.deepinwine/${BOTTLENAME}"
 EXEC_PATH="c:/Program Files/${WELINK_INSTALLER}/${WELINK_INSTALLER}.exe"
 EXEC_FILE="${WINEPREFIX}/drive_c/Program Files/${WELINK_INSTALLER}/${WELINK_INSTALLER}.exe"
 START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
 export MIME_TYPE=""
-export DEB_PACKAGE_NAME="deepin-wine-welink"
+export DEB_PACKAGE_NAME=@appname@
 export APPRUN_CMD="deepin-wine6-stable"
 DISABLE_ATTACH_FILE_DIALOG=""
 EXPORT_ENVS=""
@@ -49,11 +49,11 @@ DeployApp() {
     rm -rf "${WINEPREFIX}"
     # run installer
     msg 0 "Launching ${WELINK_INSTALLER_PATH} ..."
-    env WINEDLLOVERRIDES="winemenubuilder.exe=d" ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "${WELINK_INSTALLER_PATH}" "$@"
+    env WINEDLLOVERRIDES="winemenubuilder.exe=d" "${START_SHELL_PATH}" "${BOTTLENAME} ${APPVER}" "${WELINK_INSTALLER_PATH}" "$@"
 
     touch "${WINEPREFIX}"/reinstalled
     msg 0 "Creating ${WINEPREFIX}/PACKAGE_VERSION ..."
-    cat /opt/apps/${DEB_PACKAGE_NAME}/files/files.md5sum >"${WINEPREFIX}"/PACKAGE_VERSION
+    cat "/opt/apps/${DEB_PACKAGE_NAME}/files/files.md5sum" >"${WINEPREFIX}"/PACKAGE_VERSION
 }
 
 WakeApp() {
@@ -72,20 +72,20 @@ Run() {
     fi
  
     if [ -n "${EXEC_PATH}" ]; then
-        if [ ! -f "${WINEPREFIX}/reinstalled" ] || [ ! -f "$EXEC_FILE" ]; then
+        if [ ! -f "${WINEPREFIX}/reinstalled" ] || [ ! -f "${EXEC_FILE}" ]; then
             DeployApp "$@"
             exit 0
         fi
  
         if [ -z "${EXEC_PATH##*.lnk*}" ]; then
             msg 0 "Launching  ${EXEC_PATH} lnk file ..."
-            ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "C:/windows/command/start.exe" "/Unix" "${EXEC_PATH}" "$@"
+            "${START_SHELL_PATH}" "${BOTTLENAME} ${APPVER}" "C:/windows/command/start.exe" "/Unix" "${EXEC_PATH}" "$@"
         else
             msg 0 "Launching  ${EXEC_PATH} ..."
-            ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "${EXEC_PATH}" "$@"
+            "${START_SHELL_PATH}" "${BOTTLENAME}" "${APPVER}" "${EXEC_PATH}" "$@"
         fi
     else
-        ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "uninstaller.exe" "$@"
+        "${START_SHELL_PATH}" "${BOTTLENAME}" "${APPVER}" "uninstaller.exe" "$@"
     fi
 }