fix errors

3 files changed, 32 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6637ce626041..39c04f647469 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = deepin-wine-welink
 	pkgdesc = 华为数字化办公实践,服务政企、高校等主要客户,是全场景安全、智能、的数字化办公平台,帮助AnyBody、AnyWhere、AnyDevice、doAnyBusiness4A办公。
 	pkgver = 7.25.5.437
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.huaweicloud.com/product/welink.html
 	install = deepin-wine-welink.install
 	arch = x86_64
@@ -12,14 +12,13 @@ pkgbase = deepin-wine-welink
 	depends = xdg-utils
 	optdepends = wqy-microhei
 	optdepends = wqy-zenhei
-	provides = Huawei
-	source = com.huaweicloud.welink.spark_7.21.3.403_i386.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/com.huaweicloud.welink.spark/com.huaweicloud.welink.spark_7.21.3.403_i386.deb
-	source = WeLink-7.25.5.437.exe::https://nginx-obs-bj4.obs.cn-north-4.myhuaweicloud.com/WeLink_setup.exe
+	source = com.huaweicloud.welink.spark_7.21.3.403.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/com.huaweicloud.welink.spark/com.huaweicloud.welink.spark_7.21.3.403_i386.deb
+	source = WeLink-7.25.5.437.exe::https://welink.huaweicloud.com/download/WeLink_setup.exe
 	source = deepin-wine-welink.install
 	source = run.sh
 	sha256sums = 56273fdd2c74d0b310a4513c49cfb2ee07ab89f97312ff871c1b6d9c6b25279c
 	sha256sums = 476f51f32ecab6c5683189ce596bfd52c7220fc7d6b9b5a95f6a92c7422c3d34
 	sha256sums = d3f310b0d94bc630700afec6d0786edc1176ca28def75b518167deba1965288a
-	sha256sums = 3e1ea111c73382919476e3e56c1cb8a4b26ae0738c3c962007b7ea4e5af83f71
+	sha256sums = 0f5cf40fbcf31250db95a5b1e4d1011f1b1f3bdfb17398578065ffcb2a573e48
 
 pkgname = deepin-wine-welink
diff --git a/PKGBUILD b/PKGBUILD
index 82d6f5de3649..75474bbf9009 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,65 +3,49 @@ pkgname=deepin-wine-welink
 _pkgname=com.huaweicloud.welink.spark
 _officalname=WeLink
 pkgver=7.25.5.437
-sparkver=7.21.3.403
-pkgrel=2
+_sparkver=7.21.3.403
+pkgrel=3
 epoch=
 pkgdesc="华为数字化办公实践,服务政企、高校等主要客户,是全场景安全、智能、的数字化办公平台,帮助AnyBody、AnyWhere、AnyDevice、doAnyBusiness4A办公。"
 arch=("x86_64")
 url="https://www.huaweicloud.com/product/welink.html"
 license=('custom')
-depends=(
-    'deepin-wine6-stable'
-    'spark-dwine-helper-git'
-    'spark-transhell'
-    'xdg-utils'
-    )
-optdepends=(
-    'wqy-microhei'
-    'wqy-zenhei'
-    )
+depends=('deepin-wine6-stable' 'spark-dwine-helper-git' 'spark-transhell' 'xdg-utils')
+optdepends=('wqy-microhei' 'wqy-zenhei')
 conflicts=()
-provides=("Huawei")
+provides=()
 install="${pkgname}.install"
 source=(
-    "${_pkgname}_${sparkver}_i386.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/${_pkgname}/${_pkgname}_${sparkver}_i386.deb"
-    "${_officalname}-${pkgver}.exe::https://nginx-obs-bj4.obs.cn-north-4.myhuaweicloud.com/${_officalname}_setup.exe"
+    "${_pkgname}_${_sparkver}.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/${_pkgname}/${_pkgname}_${_sparkver}_i386.deb"
+    "${_officalname}-${pkgver}.exe::https://welink.huaweicloud.com/download/WeLink_setup.exe"
     ${pkgname}.install
     run.sh)
 sha256sums=('56273fdd2c74d0b310a4513c49cfb2ee07ab89f97312ff871c1b6d9c6b25279c'
             '476f51f32ecab6c5683189ce596bfd52c7220fc7d6b9b5a95f6a92c7422c3d34'
             'd3f310b0d94bc630700afec6d0786edc1176ca28def75b518167deba1965288a'
-            '3e1ea111c73382919476e3e56c1cb8a4b26ae0738c3c962007b7ea4e5af83f71')
+            '0f5cf40fbcf31250db95a5b1e4d1011f1b1f3bdfb17398578065ffcb2a573e48')
  
-prepare() {
-    bsdtar -xf data.tar.xz
-
-    mv "${srcdir}/opt/apps/${_pkgname}" "${srcdir}/opt/apps/${pkgname}"
-    mv "${srcdir}/opt/apps/${pkgname}/entries/applications/${_pkgname}.desktop" "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
-    mv "${srcdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${_pkgname}.png" "${srcdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${pkgname}.png"
-    
+package() {
+    bsdtar -xf data.tar.xz -C "${pkgdir}"
+    mv "${pkgdir}/opt/apps/${_pkgname}" "${pkgdir}/opt/apps/${pkgname}"
+    mv "${pkgdir}/opt/apps/${pkgname}/entries/applications/${_pkgname}.desktop" "${pkgdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
+    mv "${pkgdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${_pkgname}.png" "${pkgdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${pkgname}.png"    
     mkdir -p "${srcdir}/tmp"
     msg "Extracting Deepin Wine ${_officalname} archive ..."
-    7za x -aoa "${srcdir}/opt/apps/${pkgname}/files/files.7z" -o"${srcdir}/tmp"
-     
+    7za x -aoa "${pkgdir}/opt/apps/${pkgname}/files/files.7z" -o"${srcdir}/tmp"     
     msg "Copying latest ${_officalname} installer to ${srcdir}/tmp/drive_c/Program Files/${_officalname} ..."
-    rm -r "${srcdir}/tmp/drive_c/Program Files/${_officalname}/"
+    rm -r "${srcdir}/tmp/drive_c/Program Files/${_officalname}/" "${srcdir}/tmp/drive_c/Program Files (x86)"
     mkdir -p "${srcdir}/tmp/drive_c/Program Files/${_officalname}/"
-    install -m644 "${_officalname}-${pkgver}.exe" "${srcdir}/tmp/drive_c/Program Files/${_officalname}/${_officalname}-${pkgver}.exe"
-     
+    install -m644 "${_officalname}-${pkgver}.exe" "${srcdir}/tmp/drive_c/Program Files/${_officalname}/${_officalname}-${pkgver}.exe"     
     msg "Repackaging app archive ..."
-    rm -r "${srcdir}/opt/apps/${pkgname}/files/files.7z"
-    7za a -t7z -r "${srcdir}/opt/apps/${pkgname}/files/files.7z" "${srcdir}/tmp/*"
-     
-    sed 's/chat/Network/g' -i "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
-    sed 's/com.huaweicloud.welink.spark/deepin-wine-welink/g' -i "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
-    rm -rf "${srcdir}/opt/apps/${pkgname}/info"
-}
-    
-package() {
-    cp -r "${srcdir}/opt/" "${pkgdir}/opt/"
+    rm -r "${pkgdir}/opt/apps/${pkgname}/files/files.7z"
+    7za a -t7z -r "${pkgdir}/opt/apps/${pkgname}/files/files.7z" "${srcdir}/tmp/*"     
+    sed 's/chat/Network/g' -i "${pkgdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
+    sed 's/com.huaweicloud.welink.spark/deepin-wine-welink/g' -i "${pkgdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
+    rm -rf "${pkgdir}/opt/apps/${pkgname}/info"
     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/icons/hicolor/scalable/apps/${pkgname}.png"
+    install -Dm644 "${pkgdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    install -Dm644 "${pkgdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${pkgname}.png" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.png"
     install -Dm755 "run.sh" "${pkgdir}/opt/apps/${pkgname}/files/"
+    chown -R root:root "${pkgdir}"
 }
diff --git a/run.sh b/run.sh
index 32ea09aae3ae..6cfe1695e3e0 100644
--- a/run.sh
+++ b/run.sh
@@ -9,13 +9,13 @@
  
 BOTTLENAME="Deepin-WeLink"
 APPVER="7.21.3.403"
-WINEPREFIX="$HOME/.deepinwine/${BOTTLENAME}"
-EXEC_PATH="c:/Program Files/WeLink/WeLink.exe"
-EXEC_FILE="${WINEPREFIX}/drive_c/Program Files/WeLink/WeLink.exe"
-START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
 WELINK_INSTALLER="WeLink"
 WELINK_VER="7.25.5.437"
 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 APPRUN_CMD="deepin-wine6-stable"