fix errors

4 files changed, 20 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ad28d16898e..9fef959f6185 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deepin-wine-welink
 	pkgdesc = 华为数字化办公实践,服务政企、高校等主要客户,是全场景安全、智能、的数字化办公平台,帮助AnyBody、AnyWhere、AnyDevice、doAnyBusiness4A办公。
-	pkgver = 7.36.7
+	pkgver = 7.37.3
 	pkgrel = 1
 	url = https://www.huaweicloud.com/product/welink.html
 	install = deepin-wine-welink.install
@@ -13,17 +13,15 @@ pkgbase = deepin-wine-welink
 	optdepends = wqy-zenhei
 	conflicts = welink
 	conflicts = huaweicloudmeeting
-	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.36.7.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.37.3.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 = c703e2b726c89af1aa0c8ba31365b78d257382a91689a768c56563de00287649
+	sha256sums = 045c334577032f51d963188d30254a0e1d8fea7876fbd7b00e78bd5b7bb59685
 	sha256sums = 3e2ed9203a5ce3b2f00b6c942d8fac6b24e7a6e7b1ebc863cee2e27d3ff487db
-	sha256sums = 2a9e70d0bc04f291d2d7d774ace08edb83c5f5d299ebd66920457c9d8fb336b7
-	sha256sums = ccc8fcb75c75fe61bdb206f2a450fcaf0dfb7890ae181d9dcbde0d73c2432ccf
-	sha256sums = c54ef202c74cc198a03eb3de72e9e929d60f0ed52a02c1811078d99f4376adcc
+	sha256sums = f041befca8e199141af71a382b3de00ac64303cc74f3c53fae00ac8f18119254
+	sha256sums = 457847c22fc306279a20070ee7578403653e5c2ed8c602065f5996cf353c4722
 
 pkgname = deepin-wine-welink
diff --git a/PKGBUILD b/PKGBUILD
index c5cedaf348b3..54c196ccdc91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ _pkgname=welink
 pkgname="deepin-wine-${_pkgname}"
 _sparkname="com.huaweicloud.${_pkgname}.spark"
 _appname=WeLink
-pkgver=7.36.7
+pkgver=7.37.3
 _sparkver=7.21.3.403spark1
 pkgrel=1
 pkgdesc="华为数字化办公实践,服务政企、高校等主要客户,是全场景安全、智能、的数字化办公平台,帮助AnyBody、AnyWhere、AnyDevice、doAnyBusiness4A办公。"
@@ -28,21 +28,18 @@ conflicts=(
 )
 install="${pkgname}.install"
 source=(
-    "${pkgname}_${_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"
     "LICENSE.html::https://www.huaweicloud.com/declaration/sa_cua_computing.html"
     "${pkgname}.sh"
 )
 sha256sums=('2a5046177ad2f57ebeff4176ffe4ae2717eed19c8fd2e84fad5b9f44305d16d1'
-            'c703e2b726c89af1aa0c8ba31365b78d257382a91689a768c56563de00287649'
+            '045c334577032f51d963188d30254a0e1d8fea7876fbd7b00e78bd5b7bb59685'
             '3e2ed9203a5ce3b2f00b6c942d8fac6b24e7a6e7b1ebc863cee2e27d3ff487db'
-            '2a9e70d0bc04f291d2d7d774ace08edb83c5f5d299ebd66920457c9d8fb336b7'
-            'ccc8fcb75c75fe61bdb206f2a450fcaf0dfb7890ae181d9dcbde0d73c2432ccf'
-            'c54ef202c74cc198a03eb3de72e9e929d60f0ed52a02c1811078d99f4376adcc')
+            'f041befca8e199141af71a382b3de00ac64303cc74f3c53fae00ac8f18119254'
+            '457847c22fc306279a20070ee7578403653e5c2ed8c602065f5996cf353c4722')
 build() {
-    sed "s|@appname@|${_appname}|g" -i "${srcdir}/${pkgname}.install"
     sed -e "s|@appname@|${_appname}|g" \
         -e "s|@pkgname@|${pkgname}|g" \
         -e "s|@sparkver@|${_sparkver%spark1}|g" \
diff --git a/deepin-wine-welink.install b/deepin-wine-welink.install
index 4609b11d5074..f556f3f66724 100644
--- a/deepin-wine-welink.install
+++ b/deepin-wine-welink.install
@@ -7,10 +7,10 @@ post_install() {
     info
 }
 post_upgrade() {
-    find /home -maxdepth 2 -name ".deepinwine" -exec rm -f \{\}/Deepin-@appname@/reinstalled \;
+    find /home -maxdepth 2 -name ".deepinwine" -exec rm -f \{\}/Deepin-WeLink/reinstalled \;
     info
 }
 pre_remove() {
-    echo "deleting the @appname@ bottle..."
-    find /home -maxdepth 2 -name ".deepinwine" -exec rm -rf \{\}/Deepin-@appname@/ \;
+    echo "deleting the WeLink bottle..."
+    find /home -maxdepth 2 -name ".deepinwine" -exec rm -rf \{\}/Deepin-WeLink/ \;
 }
\ No newline at end of file
diff --git a/deepin-wine-welink.sh b/deepin-wine-welink.sh
index 0871f248254d..489833c632f0 100644
--- a/deepin-wine-welink.sh
+++ b/deepin-wine-welink.sh
@@ -1,12 +1,5 @@
 #!/bin/sh
- 
-#   Copyright (C) 2016 Deepin, Inc.
-#
-#   Author:     Li LongYu <lilongyu@linuxdeepin.com>
-#               Peng Hao <penghao@linuxdeepin.com>
- 
-#               Vufa <countstarlight@gmail.com>
- 
+set -e
 BOTTLENAME="Deepin-@appname@"
 APPVER=@sparkver@
 WELINK_INSTALLER="@appname@"
@@ -22,27 +15,19 @@ export APPRUN_CMD="deepin-wine6-stable"
 DISABLE_ATTACH_FILE_DIALOG=""
 EXPORT_ENVS=""
 SPECIFY_SHELL_DIR=$(dirname ${START_SHELL_PATH})
-
 export SPECIFY_SHELL_DIR
- 
 ARCHIVE_FILE_DIR="/opt/apps/${DEB_PACKAGE_NAME}/files"
- 
 export WINEDLLPATH=/opt/${APPRUN_CMD}/lib:/opt/${APPRUN_CMD}/lib64
- 
 export LD_LIBRARY_PATH=/opt/apps/${DEB_PACKAGE_NAME}/files/lib32
- 
 export WINEPREDLL="${ARCHIVE_FILE_DIR}/dlls"
- 
 msg() {
     ECHO_LEVEL=("\033[1;32m==> " "\033[1;31m==> ERROR: ")
     echo -e "${ECHO_LEVEL[$1]}\033[1;37m$2\033[0m"
 }
- 
 OpenWinecfg() {
     msg 0 "Launching winecfg with ${APPRUN_CMD} in ${WINEPREFIX} ..."
     env WINEPREFIX="${WINEPREFIX}" ${APPRUN_CMD} winecfg
 }
- 
 DeployApp() {
     # deploy bottle
     msg 0 "Deploying ${WINEPREFIX} ..."
@@ -55,47 +40,40 @@ DeployApp() {
     msg 0 "Creating ${WINEPREFIX}/PACKAGE_VERSION ..."
     cat "/opt/apps/${DEB_PACKAGE_NAME}/files/files.md5sum" >"${WINEPREFIX}"/PACKAGE_VERSION
 }
-
 WakeApp() {
     env WINEPREDLL="${ARCHIVE_FILE_DIR}/dlls" \
-        WINEDLLPATH=/opt/${APPRUN_CMD}/lib:/opt/${APPRUN_CMD}/lib64 \
-        WINEPREFIX="${WINEPREFIX}" ${APPRUN_CMD} /opt/deepinwine/tools/sendkeys.exe w
+        WINEDLLPATH="/opt/${APPRUN_CMD}/lib:/opt/${APPRUN_CMD}/lib64" \
+        WINEPREFIX="${WINEPREFIX}" "${APPRUN_CMD}" /opt/deepinwine/tools/sendkeys.exe w
 }
-
 Run() {
     if [ -z "${DISABLE_ATTACH_FILE_DIALOG}" ]; then
         export ATTACH_FILE_DIALOG=1
     fi
- 
     if [ -n "${EXPORT_ENVS}" ]; then
         export "${EXPORT_ENVS}"
     fi
- 
     if [ -n "${EXEC_PATH}" ]; 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}" "$@"
+            exec "${START_SHELL_PATH}" "${BOTTLENAME} ${APPVER}" "C:/windows/command/start.exe" "/Unix" "${EXEC_PATH}" "$@" || exit $?
         else
             msg 0 "Launching  ${EXEC_PATH} ..."
-            "${START_SHELL_PATH}" "${BOTTLENAME}" "${APPVER}" "${EXEC_PATH}" "$@"
+            exec "${START_SHELL_PATH}" "${BOTTLENAME}" "${APPVER}" "${EXEC_PATH}" "$@" || exit $?
         fi
     else
-        "${START_SHELL_PATH}" "${BOTTLENAME}" "${APPVER}" "uninstaller.exe" "$@"
+        exec "${START_SHELL_PATH}" "${BOTTLENAME}" "${APPVER}" "uninstaller.exe" "$@" || exit $?
     fi
 }
- 
 HelpApp() {
     echo " Extra Commands:"
     echo " winecfg          Open winecfg"
     echo " -w/--wake       Wake up background program"
     echo " -h/--help        Show program help info"
 }
- 
 if [ -z "$1" ]; then
     Run "$@"
     exit 0