update to 2.5.20

3 files changed, 36 insertions, 124 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b13087e1f6c..dd39a84a1316 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,28 @@
 pkgbase = deepin-wine-quarkclouddrive
 	pkgdesc = 夸克网盘是夸克推出的一款云服务产品，可轻松进行照片、视频、文档、音频等文件的在线备份、同步和分享，并支持电脑/手机/iPad端等多个端。
-	pkgver = 2.5.17
+	pkgver = 2.5.20
 	pkgrel = 1
 	url = https://pan.quark.cn/
 	install = deepin-wine-quarkclouddrive.install
 	arch = x86_64
 	license = custom:freeware
 	depends = deepin-wine6-stable
-	depends = spark-dwine-helper-git
+	depends = spark-dwine-helper
 	depends = xdg-utils
+	depends = hicolor-icon-theme
+	depends = sh
 	optdepends = wqy-microhei
 	optdepends = wqy-zenhei
 	provides = Quark
 	source = cn.quarkclouddrive.spark_2.5.1spark1_amd64.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/network/cn.quarkclouddrive.spark/cn.quarkclouddrive.spark_2.5.1spark1_amd64.deb
-	source = quark-cloud-drive-2.5.17.exe::https://webcdn.m.qq.com/spcmgr/download/QuarkCloudDrive-2.5.17-win-release2.exe
+	source = quark-cloud-drive-2.5.20.exe::https://webcdn.m.qq.com/spcmgr/download/QuarkCloudDrive-v2.5.20-release-pckk@othre_ch-20230404152644.exe
 	source = LICENSE::https://broccoli.uc.cn/apps/quark_icloud_pay/routes/service_help?uc_param_str=dsdnfrpfbivesscpgimibtbmnijblauputogpintnwktprchmt&uc_biz_str=S%3Acustom|C%3Atitlebar_hover_2
 	source = deepin-wine-quarkclouddrive.install
 	source = run.sh
 	sha256sums = a7426b5b1fac66aa464b62d81740d5c86067f6bd00d64d0dd9708f2b05b91b04
-	sha256sums = 11138dc2c415c28226323f4db1d495dbe5f49aad079dfc1f110ba3c2c3ac9ac3
-	sha256sums = 7b9b1a3ec72f29f0d38b2c0438942c22767d7adef8205ed0600ad080e921cb7b
+	sha256sums = ef3fa51281db6d5f8e39e03524e26894e2d6e5b6bd64a1d1746d08f26d0ee0f0
+	sha256sums = ce1a9c00cd9b2b66e5b5af9437e376ecca5c16573b44de6d5ca67f64508d32c6
 	sha256sums = d7f46cae43addb386fd3dddf469530b6942143c2a4ce00e1b92d7f256ed90b70
-	sha256sums = 85b028b2d823bea5f2cc807996a34887cf4e26e40a59399f09724e3e76451a98
+	sha256sums = 0f6f35015bc010065f938e9dd9b57ccade45493fb68fe2e0607d6fb9a24e6022
 
 pkgname = deepin-wine-quarkclouddrive
diff --git a/PKGBUILD b/PKGBUILD
index 731e4a4c692a..816982b792c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ _officalname=quarkclouddrive
 pkgname="deepin-wine-${_officalname}"
 _pkgdownloadname=QuarkCloudDrive
 _installpkgpath=quark-cloud-drive
-pkgver=2.5.17
+pkgver=2.5.20
 _sparkpkgname=cn.quarkclouddrive.spark
 _sparkver=2.5.1spark1
 pkgrel=1
@@ -12,23 +12,23 @@ pkgdesc="夸克网盘是夸克推出的一款云服务产品，可轻松进行�
 arch=("x86_64")
 url="https://pan.quark.cn/"
 license=('custom:freeware')
-depends=('deepin-wine6-stable' 'spark-dwine-helper-git' 'xdg-utils')
+depends=('deepin-wine6-stable' 'spark-dwine-helper' 'xdg-utils' 'hicolor-icon-theme' 'sh')
 optdepends=('wqy-microhei' 'wqy-zenhei')
 conflicts=()
 provides=("Quark")
 install="${pkgname}.install"
 source=(
     "${_sparkpkgname}_${_sparkver}_amd64.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/network/${_sparkpkgname}/${_sparkpkgname}_${_sparkver}_amd64.deb"
-    "${_installpkgpath}-${pkgver}.exe::https://webcdn.m.qq.com/spcmgr/download/${_pkgdownloadname}-${pkgver}-win-release2.exe"
+    "${_installpkgpath}-${pkgver}.exe::https://webcdn.m.qq.com/spcmgr/download/${_pkgdownloadname}-v${pkgver}-release-pckk@othre_ch-20230404152644.exe"
     "LICENSE::https://broccoli.uc.cn/apps/quark_icloud_pay/routes/service_help?uc_param_str=dsdnfrpfbivesscpgimibtbmnijblauputogpintnwktprchmt&uc_biz_str=S%3Acustom|C%3Atitlebar_hover_2"
     "${pkgname}.install"
     "run.sh"
     )
 sha256sums=('a7426b5b1fac66aa464b62d81740d5c86067f6bd00d64d0dd9708f2b05b91b04'
-            '11138dc2c415c28226323f4db1d495dbe5f49aad079dfc1f110ba3c2c3ac9ac3'
-            '7b9b1a3ec72f29f0d38b2c0438942c22767d7adef8205ed0600ad080e921cb7b'
+            'ef3fa51281db6d5f8e39e03524e26894e2d6e5b6bd64a1d1746d08f26d0ee0f0'
+            'ce1a9c00cd9b2b66e5b5af9437e376ecca5c16573b44de6d5ca67f64508d32c6'
             'd7f46cae43addb386fd3dddf469530b6942143c2a4ce00e1b92d7f256ed90b70'
-            '85b028b2d823bea5f2cc807996a34887cf4e26e40a59399f09724e3e76451a98')
+            '0f6f35015bc010065f938e9dd9b57ccade45493fb68fe2e0607d6fb9a24e6022')
    
 prepare() {
     bsdtar -xf data.tar.xz
@@ -40,24 +40,21 @@ prepare() {
     msg "Copying latest ${_officalname} installer to ${srcdir}/tmp/drive_c/Program Files (x86)/${_installpkgpath} ..."
     rm -r "${srcdir}/tmp/drive_c/Program Files (x86)/${_installpkgpath}"
     mkdir -p "${srcdir}/tmp/drive_c/Program Files (x86)/${_installpkgpath}"
-    #rm -r "${srcdir}/opt/apps/${pkgname}/files/dlls"
-    install -m644 "${_installpkgpath}-${pkgver}.exe" "${srcdir}/tmp/drive_c/Program Files (x86)/${_installpkgpath}/${_installpkgpath}-${pkgver}.exe"
+    install -m644 "${_installpkgpath}-${pkgver}.exe" "${srcdir}/tmp/drive_c/Program Files (x86)/${_installpkgpath}/${_pkgdownloadname}.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/*"
-       
-    mv "${srcdir}/opt/apps/${pkgname}/entries/applications/${_sparkpkgname}.desktop" "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
-    mv "${srcdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${_sparkpkgname}.png" "${srcdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${pkgname}.png"
-    sed 's/cn.189.cloud.spark/deepin-wine-quarkclouddrive/g' -i "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
+
+    sed 's|cn.189.cloud.spark|deepin-wine-quarkclouddrive|g' -i "${srcdir}/opt/apps/${pkgname}/entries/applications/${_sparkpkgname}.desktop"
     rm -rf "${srcdir}/opt/apps/${pkgname}/info"
 }
       
 package() {
     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/icons/hicolor/scalable/apps/${pkgname}.png"
-    install  "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm644 "${srcdir}/opt/apps/${pkgname}/entries/applications/${_sparkpkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    install -Dm644 "${srcdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${_sparkpkgname}.png" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.png"
+    install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
     install -Dm755 "${srcdir}/run.sh" "${pkgdir}/opt/apps/${pkgname}/files/"
 }
\ No newline at end of file
diff --git a/run.sh b/run.sh
index ce0097dd91a6..f57287e21126 100644
--- a/run.sh
+++ b/run.sh
@@ -1,117 +1,30 @@
 #!/bin/sh
-    
+   
 #   Copyright (C) 2016 Deepin, Inc.
 #
 #   Author:     Li LongYu <lilongyu@linuxdeepin.com>
 #               Peng Hao <penghao@linuxdeepin.com>
-    
-#               Vufa <countstarlight@gmail.com>
-    
+ 
+version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
 BOTTLENAME="Deepin-QuarkCloudDrive"
-APPVER="2.5.1spark1"
+APPVER="2.5.20"
 WINEPREFIX="${HOME}/.deepinwine/${BOTTLENAME}"
 EXEC_PATH="c:/Program Files (x86)/quark-cloud-drive/QuarkCloudDrive.exe"
-EXEC_FILE="${WINEPREFIX}/drive_c/Program Files (x86)/quark-cloud-drive/QuarkCloudDrive.exe"
 START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
-UPDATEAPP_INSTALLER="quark-cloud-drive"
-UPDATEAPP_VER="2.5.17"
-UPDATEAPP_INSTALLER_PATH="c:/Program Files (x86)/${UPDATEAPP_INSTALLER}/${UPDATEAPP_INSTALLER}-${UPDATEAPP_VER}.exe"
 export MIME_TYPE=""
 export DEB_PACKAGE_NAME="deepin-wine-quarkclouddrive"
 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} ..."
-    rm -rf "${WINEPREFIX}"
-    # run installer
-    msg 0 "Launching ${UPDATEAPP_INSTALLER_PATH} ..."
-    env WINEDLLOVERRIDES="winemenubuilder.exe=d" ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "${UPDATEAPP_INSTALLER_PATH}" "$@"
-   
-    touch "${WINEPREFIX}"/reinstalled
-    msg 0 "Creating ${WINEPREFIX}/PACKAGE_VERSION ..."
-    cat /opt/apps/${DEB_PACKAGE_NAME}/files/files.md5sum >"${WINEPREFIX}"/PACKAGE_VERSION
-}
+DISABLE_ATTACH_FILE_DIALOG="1"
+export SPECIFY_SHELL_DIR=`dirname ${START_SHELL_PATH}`
+ARCHIVE_FILE_DIR="/opt/apps/$DEB_PACKAGE_NAME/files"
+export WINEPREDLL="$ARCHIVE_FILE_DIR/dlls"
    
-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
-}
-   
-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}" "$@"
-        else
-            msg 0 "Launching  ${EXEC_PATH} ..."
-            ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "${EXEC_PATH}" "$@"
-        fi
-    else
-        ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "uninstaller.exe" "$@"
-    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
+if [ -z "$DISABLE_ATTACH_FILE_DIALOG" ];then
+    export ATTACH_FILE_DIALOG=1
 fi
-case $1 in
-"winecfg")
-    OpenWinecfg
-    ;;
-"-w" | "--wake")
-    WakeApp "$@"
-    ;;
-"-h" | "--help")
-    HelpApp "$@"
-    ;;
-*)
-    Run "$@"
-    ;;
-esac
-exit 0
\ No newline at end of file
+   
+if [ -n "$EXEC_PATH" ];then
+    $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
+else
+    $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
+fi
\ No newline at end of file