update4.1.6.6017

3 files changed, 62 insertions, 19 deletions

diff --git a/.gitignore b/.gitignore
index fadaf3ed8783..a11faa8d4d46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.zst
 src
 pkg
+com.qq.weixin.work.deepin*
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 33b8a6192e3b..3845f4b9b5f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: 302606571@qq.com
 # Contributor: luosoy <249799588@qq.com>
 pkgname=com.qq.weixin.work.deepin-x11
-pkgver=4.0.0.6007deepin10
+pkgver=4.1.6.6017deepin5.1
 deepin_app=com.qq.weixin.work.deepin
 pkgrel=1
 epoch=
@@ -18,6 +18,7 @@ depends=(
         'lib32-ocl-icd' 'deepin-udis86' 'lib32-zlib' 'lib32-ncurses' 'lib32-fontconfig'
         'lib32-freetype2' 'lib32-gettext' 'lib32-libxcursor' 'lib32-mesa' 'lib32-libjpeg6'
         'lib32-libxrandr' 'lib32-libxi' 'lib32-glu' 'deepin-wine-helper' 'deepin-wine6-stable' 'p7zip'
+		'spark-dwine-helper'
     )
 makedepends=('tar')
 checkdepends=()
@@ -29,18 +30,17 @@ backup=()
 options=()
 install=
 changelog=
-source=("https://com-store-packages.uniontech.com/appstore/pool/appstore/c/${deepin_app}/${deepin_app}_${pkgver}_i386.deb")
-# source=("./${deepin_app}_4.0.0.6007deepin10_i386.deb")
+# source=("https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/com.qq.weixin.work.deepin/${deepin_app}_${pkgver}_all.deb")
+# source=("https://com-store-packages.uniontech.com/appstore/pool/appstore/c/${deepin_app}/${deepin_app}_${pkgver}_all.deb")
+source=("./${deepin_app}_${pkgver}_all.deb")
 # 换为对象存储的zst文件
-# source=("https://community-store-packages.deepin.com/appstore/pool/appstore/c/${deepin_app}/${deepin_app}_${pkgver}_i386.deb")
-# source=("https://master.dl.sourceforge.net/project/deepin-wine-apps/${deepin_app}_${pkgver}_i386.deb")
-noextract=("${deepin_app}_${pkgver}_i386.deb")
-md5sums=('d49b0718c658ac8686ff77e77acb37e7')
+noextract=("${deepin_app}_${pkgver}_all.deb")
+md5sums=('abb941d9173a153e8c9946dc9cc51a74')
 validpgpkeys=()
 
 prepare() {
 	rm -rf ${deepin_app}-${pkgver}
-	ar -x ${deepin_app}_${pkgver}_i386.deb
+	ar -x ${deepin_app}_${pkgver}_all.deb
 	mkdir ${deepin_app}-${pkgver}
 	tar -xf data.tar.xz --directory="${deepin_app}-${pkgver}"
 	tar -xf ../lib.tar.xz --directory="${deepin_app}-${pkgver}"/opt/apps/${deepin_app}/
diff --git a/run.sh b/run.sh
index 1d1759fa74d9..eac4139f69a6 100755
--- a/run.sh
+++ b/run.sh
@@ -1,34 +1,53 @@
-#!/bin/sh
+#!/bin/bash
 
 #   Copyright (C) 2016 Deepin, Inc.
 #
 #   Author:     Li LongYu <lilongyu@linuxdeepin.com>
 #               Peng Hao <penghao@linuxdeepin.com>
 
-#  fixed bugs Author: HSY <302606571@qq.com>
-
 version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
 
+ACTIVEX_NAME=""
 BOTTLENAME="Deepin-WXWork"
-# APPVER="3.1.12.6001deepin8"
-APPVER="4.0.0.6007deepin10"
+APPVER="4.1.6.6017deepin5"
 EXEC_PATH="c:/Program Files/WXWork/WXWork.exe"
-START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
+START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
 export MIME_TYPE=""
+export MIME_EXEC=""
 export DEB_PACKAGE_NAME="com.qq.weixin.work.deepin"
 export APPRUN_CMD="deepin-wine6-stable"
+
 export LD_LIBRARY_PATH=/opt/apps/com.qq.weixin.work.deepin/lib/
-export GDK_BACKEND=x11
 
 DISABLE_ATTACH_FILE_DIALOG=""
-
-export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`
+EXPORT_ENVS=""
+EXEC_NAME="WXWork.exe"
+INSTALL_SETUP=""
+export BOX86_EMU_CMD="/opt/deepin-box86/stable/box86"
+export DEF_EMU_NAME="exagear"
+export SPECIFY_SHELL_DIR=${START_SHELL_PATH%/*}
+export WINESERVICESNODELAY=""
+export WINESERVICESDISABLE="nsiproxy"
 
 ARCHIVE_FILE_DIR="/opt/apps/$DEB_PACKAGE_NAME/files"
 
-# export WINEDLLPATH=/opt/$APPRUN_CMD/lib:/opt/$APPRUN_CMD/lib64
+if [ -z "$APPRUN_CMD" ];then
+    export APPRUN_CMD="/opt/deepin-wine6-stable/bin/wine"
+fi
+if [ -f "$APPRUN_CMD" ];then
+    wine_path=$(dirname $APPRUN_CMD)
+    wine_path=$(realpath "$wine_path/../")
+    export WINEDLLPATH=$wine_path/lib:$wine_path/lib64
+else
+    export WINEDLLPATH=/opt/$APPRUN_CMD/lib:/opt/$APPRUN_CMD/lib64
+fi
+
+export WINEPREDLL="$ARCHIVE_FILE_DIR/dlls"
 
-# export WINEPREDLL="$ARCHIVE_FILE_DIR/dlls"
+_SetRegistryValue()
+{
+    env WINEPREFIX="$BOTTLEPATH" $APPRUN_CMD reg ADD "$1" /v "$2" /t "$3" /d "$4" /f
+}
 
 if [ -z "$DISABLE_ATTACH_FILE_DIALOG" ];then
     export ATTACH_FILE_DIALOG=1
@@ -38,12 +57,35 @@ if [ -n "$EXPORT_ENVS" ];then
     export $EXPORT_ENVS
 fi
 
+# 打包安装程序的情况
+if [[ -z "$EXEC_PATH" ]] && [[ -n "$INSTALL_SETUP" ]];then
+    $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" -c
+    BOTTLEPATH="$HOME/.deepinwine/$BOTTLENAME"
+    EXEC_PATH=$(find "$BOTTLEPATH" -name $EXEC_NAME | head -1)
+    if [ -z "$EXEC_PATH" ];then
+        _SetRegistryValue "HKCU\\Software\\Wine\\DllOverrides" winemenubuilder.exe REG_SZ
+        WINEPREFIX="$BOTTLEPATH" $APPRUN_CMD "$ARCHIVE_FILE_DIR/$INSTALL_SETUP"
+        EXEC_PATH=$(find "$BOTTLEPATH" -name $EXEC_NAME | head -1)
+
+        cp "$ARCHIVE_FILE_DIR/setup.md5sum" "$BOTTLEPATH"
+    fi
+
+    if [ -z "$EXEC_PATH" ];then
+        echo "安装失败退出"
+        exit
+    fi
+fi
+
 if [ -n "$EXEC_PATH" ];then
     if [ -z "${EXEC_PATH##*.lnk*}" ];then
         $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
+    elif [ -z "${EXEC_PATH##*.bat}" ];then
+        $START_SHELL_PATH $BOTTLENAME $APPVER "cmd" -f /c "$EXEC_PATH" "${@:2}"
     else
         $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
     fi
+elif [ -n "$ACTIVEX_NAME" ] && [ $# -gt 1 ];then
+    $START_SHELL_PATH $BOTTLENAME $APPVER "$1" -f "${@:2}"
 else
     $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
 fi