fix some errors

4 files changed, 21 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d31b73b67a89..6637ce626041 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = deepin-wine-welink
 	pkgdesc = 华为数字化办公实践,服务政企、高校等主要客户,是全场景安全、智能、的数字化办公平台,帮助AnyBody、AnyWhere、AnyDevice、doAnyBusiness4A办公。
 	pkgver = 7.25.5.437
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.huaweicloud.com/product/welink.html
 	install = deepin-wine-welink.install
 	arch = x86_64
@@ -13,13 +13,13 @@ pkgbase = deepin-wine-welink
 	optdepends = wqy-microhei
 	optdepends = wqy-zenhei
 	provides = Huawei
-	source = 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 = 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 = deepin-wine-welink.install
 	source = run.sh
 	sha256sums = 56273fdd2c74d0b310a4513c49cfb2ee07ab89f97312ff871c1b6d9c6b25279c
 	sha256sums = 476f51f32ecab6c5683189ce596bfd52c7220fc7d6b9b5a95f6a92c7422c3d34
-	sha256sums = d0f49dc030924f3a6ae84ca17e7b5148ad5ce669b7b20ff5ff37a5253cfefce2
-	sha256sums = a9778c03f527836e937eb890cb8b948bd869e96985d53ca15afc7a876425e909
+	sha256sums = d3f310b0d94bc630700afec6d0786edc1176ca28def75b518167deba1965288a
+	sha256sums = 3e1ea111c73382919476e3e56c1cb8a4b26ae0738c3c962007b7ea4e5af83f71
 
 pkgname = deepin-wine-welink
diff --git a/PKGBUILD b/PKGBUILD
index 7aae51451ef8..82d6f5de3649 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _pkgname=com.huaweicloud.welink.spark
 _officalname=WeLink
 pkgver=7.25.5.437
 sparkver=7.21.3.403
-pkgrel=1
+pkgrel=2
 epoch=
 pkgdesc="华为数字化办公实践,服务政企、高校等主要客户,是全场景安全、智能、的数字化办公平台,帮助AnyBody、AnyWhere、AnyDevice、doAnyBusiness4A办公。"
 arch=("x86_64")
@@ -23,18 +23,23 @@ optdepends=(
 conflicts=()
 provides=("Huawei")
 install="${pkgname}.install"
-source=("https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/${_pkgname}/${_pkgname}_${sparkver}_i386.deb"
+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}.install
     run.sh)
 sha256sums=('56273fdd2c74d0b310a4513c49cfb2ee07ab89f97312ff871c1b6d9c6b25279c'
             '476f51f32ecab6c5683189ce596bfd52c7220fc7d6b9b5a95f6a92c7422c3d34'
-            'd0f49dc030924f3a6ae84ca17e7b5148ad5ce669b7b20ff5ff37a5253cfefce2'
-            'a9778c03f527836e937eb890cb8b948bd869e96985d53ca15afc7a876425e909')
+            'd3f310b0d94bc630700afec6d0786edc1176ca28def75b518167deba1965288a'
+            '3e1ea111c73382919476e3e56c1cb8a4b26ae0738c3c962007b7ea4e5af83f71')
  
 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"
+    
     mkdir -p "${srcdir}/tmp"
     msg "Extracting Deepin Wine ${_officalname} archive ..."
     7za x -aoa "${srcdir}/opt/apps/${pkgname}/files/files.7z" -o"${srcdir}/tmp"
@@ -48,18 +53,15 @@ prepare() {
     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"
-    sed 's/Icon/#Icon/g' -i "${srcdir}/opt/apps/${pkgname}/entries/applications/${_pkgname}.desktop"
-    echo "Icon=deepin-wine-welink.png" >> "${srcdir}/opt/apps/${pkgname}/entries/applications/${_pkgname}.desktop"
+    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/"
-    mv "${pkgdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${_pkgname}.png" "${pkgdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${pkgname}.png"
     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 "${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 -Dm755 "run.sh" "${pkgdir}/opt/apps/${pkgname}/files/"
 }
diff --git a/deepin-wine-welink.install b/deepin-wine-welink.install
index 4506415971e8..376e684b5f8b 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-Welink/reinstalled \;
+    find /home -maxdepth 2 -name ".deepinwine" -exec rm -f \{\}/Deepin-WeLink/reinstalled \;
     info
 }
 pre_remove() {
     echo "deleting the WeChat bottle..."
-    find /home -maxdepth 2 -name ".deepinwine" -exec rm -rf \{\}/Deepin-Welink/ \;
+    find /home -maxdepth 2 -name ".deepinwine" -exec rm -rf \{\}/Deepin-WeLink/ \;
 }
\ No newline at end of file
diff --git a/run.sh b/run.sh
index b8077a34fea7..32ea09aae3ae 100644
--- a/run.sh
+++ b/run.sh
@@ -10,12 +10,12 @@
 BOTTLENAME="Deepin-WeLink"
 APPVER="7.21.3.403"
 WINEPREFIX="$HOME/.deepinwine/${BOTTLENAME}"
-EXEC_PATH="C:/Program Files/WeLink/WeLink.exe"
+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"
+WELINK_INSTALLER_PATH="c:/Program Files/WeLink/${WELINK_INSTALLER}-${WELINK_VER}.exe"
 export MIME_TYPE=""
 export DEB_PACKAGE_NAME="deepin-wine-welink"
 export APPRUN_CMD="deepin-wine6-stable"