Upgrade WeChat to 2.9.0.123 and optimized switch to deepin-wine

Signed-off-by: Codist <countstarlight@gmail.com>

5 files changed, 49 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 578103d2290b..48c0414dad24 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deepin-wine-wechat
 	pkgdesc = Tencent WeChat (com.wechat) on Deepin Wine For Archlinux
-	pkgver = 2.9.0.114
+	pkgver = 2.9.0.123
 	pkgrel = 1
 	url = https://weixin.qq.com/
 	install = deepin-wine-wechat.install
@@ -20,13 +20,13 @@ pkgbase = deepin-wine-wechat
 	depends = lib32-libldap
 	conflicts = deepin-wechat
 	source = https://mirrors.ustc.edu.cn/deepin/pool/non-free/d/deepin.com.wechat/deepin.com.wechat_2.6.8.65deepin0_i386.deb
-	source = WeChatSetup-2.9.0.114.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
+	source = WeChatSetup-2.9.0.123.exe::https://dldir1.qq.com/weixin/Windows/WeChatSetup.exe
 	source = run.sh
 	source = reg.patch
 	source = shadow.exe
 	md5sums = fe31cf4f0f6186fc1c99adc1512f5305
-	md5sums = 4e8a6b02e3090d7277669f849b80007a
-	md5sums = 5a5e340c27759cf4ce4b078206b6c424
+	md5sums = 0f64e8d65338e8c136a825ed5b717d66
+	md5sums = ee59ffc498b45598abe0e3aea03ca425
 	md5sums = f264f961704f2aa1d480971b0e58617a
 	md5sums = d83f1c3845f28abd81cbfd215089d3d8
 
diff --git a/PKGBUILD b/PKGBUILD
index 357d80ce54ec..05d9437df19e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Codist <countstarlight@gmail.com>
 
 pkgname=deepin-wine-wechat
-pkgver=2.9.0.114
+pkgver=2.9.0.123
 wechat_installer=WeChatSetup
 deepinwechatver=2.6.8.65deepin0
 pkgrel=1
@@ -19,8 +19,8 @@ source=("$_mirror/pool/non-free/d/deepin.com.wechat/deepin.com.wechat_${deepinwe
   "reg.patch"
   "shadow.exe")
 md5sums=('fe31cf4f0f6186fc1c99adc1512f5305'
-  '4e8a6b02e3090d7277669f849b80007a'
-  '5a5e340c27759cf4ce4b078206b6c424'
+  '0f64e8d65338e8c136a825ed5b717d66'
+  'ee59ffc498b45598abe0e3aea03ca425'
   'f264f961704f2aa1d480971b0e58617a'
   'd83f1c3845f28abd81cbfd215089d3d8')
 
@@ -51,6 +51,7 @@ package() {
   msg "Copying WeChat to /opt/deepinwine/apps/Deepin-WeChat ..."
   install -d "${pkgdir}/opt/deepinwine/apps/Deepin-WeChat"
   install -m644 "${srcdir}/files.7z" "${pkgdir}/opt/deepinwine/apps/Deepin-WeChat/"
+  install -m644 "${srcdir}/reg.patch" "${pkgdir}/opt/deepinwine/apps/Deepin-WeChat/"
   install -m755 "${srcdir}/run.sh" "${pkgdir}/opt/deepinwine/apps/Deepin-WeChat/"
   install -m644 "${srcdir}/${wechat_installer}-${pkgver}.exe" "${pkgdir}/opt/deepinwine/apps/Deepin-WeChat/"
 }
diff --git a/README.md b/README.md
index b600b0f72f59..b06ed2c26d9a 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
     <img src="https://travis-ci.org/countstarlight/deepin-wine-wechat-arch.svg?branch=master" alt="Build Status">
   </a>
   <a href="https://pc.weixin.qq.com/">
-    <img src="https://img.shields.io/badge/WeChat-2.9.0.114-blue.svg" alt="WeChat Version">
+    <img src="https://img.shields.io/badge/WeChat-2.9.0.123-blue.svg" alt="WeChat Version">
   </a>
   <a href="https://aur.archlinux.org/packages/deepin-wine-wechat/">
     <img src="https://img.shields.io/aur/version/deepin-wine-wechat.svg" alt="AUR Version">
@@ -110,19 +110,20 @@ sudo pacman -U #下载的包名
 
 ## 兼容性记录
 
-| 微信版本  | wine版本 | 兼容性 |                             备注                             | deepin-wine版本 | 兼容性 | 备注 |
-| :-------: | :------: | :----: | :----------------------------------------------------------: | :-------------: | :----: | :--: |
-| 2.9.0.114 |   5.6    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |      |
-| 2.9.0.112 |   5.5    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |      |
-| 2.8.0.133 |   5.3    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |      |
-| 2.8.0.112 | 5.0-rc4  |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |      |
-| 2.8.0.106 |   4.19   |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |      |
-| 2.7.1.88  |  4.19+   |  支持  |                                                              |                 |        |      |
-| 2.7.1.88  |   4.18   |  部分  |                      不能使用中文输入法                      |                 |        |      |
-| 2.7.1.85  |   4.18   |  部分  |                      不能使用中文输入法                      |    2.18_18-2    |   ?    |      |
-| 2.7.1.82  |   4.18   |  部分  |                      不能使用中文输入法                      |    2.18_18-2    | 不支持 | 闪退 |
-| 2.7.1.82  |   4.17   |  部分  |                      不能使用中文输入法                      |    2.18_18-2    | 不支持 | 闪退 |
-| 2.6.8.65  |   4.16   |  支持  |                                                              |    2.18_18-2    |  支持  |      |
+| 微信版本  | wine版本 | 兼容性 |                             备注                             | deepin-wine版本 | 兼容性 |                             备注                             |
+| :-------: | :------: | :----: | :----------------------------------------------------------: | :-------------: | :----: | :----------------------------------------------------------: |
+| 2.9.0.123 |   5.7    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |    2.18_22-3    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |
+| 2.9.0.114 |   5.6    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |                                                              |
+| 2.9.0.112 |   5.5    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |                                                              |
+| 2.8.0.133 |   5.3    |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |                                                              |
+| 2.8.0.112 | 5.0-rc4  |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |                                                              |
+| 2.8.0.106 |   4.19   |  部分  | 发送图片有问题: [#42](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/42) |                 |        |                                                              |
+| 2.7.1.88  |  4.19+   |  支持  |                                                              |                 |        |                                                              |
+| 2.7.1.88  |   4.18   |  部分  |                      不能使用中文输入法                      |                 |        |                                                              |
+| 2.7.1.85  |   4.18   |  部分  |                      不能使用中文输入法                      |    2.18_18-2    |   ?    |                                                              |
+| 2.7.1.82  |   4.18   |  部分  |                      不能使用中文输入法                      |    2.18_18-2    | 不支持 |                             闪退                             |
+| 2.7.1.82  |   4.17   |  部分  |                      不能使用中文输入法                      |    2.18_18-2    | 不支持 |                             闪退                             |
+| 2.6.8.65  |   4.16   |  支持  |                                                              |    2.18_18-2    |  支持  |                                                              |
 
 ## 切换到 `deepin-wine`
 
@@ -138,7 +139,7 @@ sudo pacman -U #下载的包名
 /opt/deepinwine/apps/Deepin-WeChat/run.sh -d
 ```
 
-这会安装需要的依赖并移除已安装的微信目录
+这会安装需要的依赖，移除已安装的微信目录并回退对注册表文件的修改
 
 切换回 `wine`：
 
@@ -266,6 +267,7 @@ CallApp()
 
 ## 更新日志
 
+* 2020-05-10 WeChat-2.9.0.123
 * 2020-04-24 WeChat-2.9.0.114
 * 2020-04-20 WeChat-2.9.0.112
 * 2020-03-08 WeChat-2.8.0.133
diff --git a/deepin-wine-wechat.install b/deepin-wine-wechat.install
index 1b9ef098ae41..c0d902a22c43 100644
--- a/deepin-wine-wechat.install
+++ b/deepin-wine-wechat.install
@@ -1,12 +1,12 @@
 info() {
     echo -e "\033[0;34m============================提示/INFO==============================="
-    echo -e "\033[0;34m* 反馈问题(Report issue):"
-    echo -e "\033[0;34m  https://github.com/countstarlight/deepin-wine-wechat-arch/issues"
-    echo -e "\033[0;34m* 切换到 'deepin-wine'(Switch to 'deepin-wine'):"
-    echo -e "\033[0;34m  https://github.com/countstarlight/deepin-wine-wechat-arch"
-    echo -e "\033[0;34m* 安装包下载(Installation package download):"
-    echo -e "\033[0;34m  https://github.com/countstarlight/deepin-wine-wechat-arch/releases"
-    echo -e "\033[0;34m===================================================================="
+    echo -e "* 反馈问题(Report issue):"
+    echo -e "  https://github.com/countstarlight/deepin-wine-wechat-arch/issues"
+    echo -e "* 切换到 'deepin-wine'(Switch to 'deepin-wine'):"
+    echo -e "  https://github.com/countstarlight/deepin-wine-wechat-arch"
+    echo -e "* 安装包下载(Installation package download):"
+    echo -e "  https://github.com/countstarlight/deepin-wine-wechat-arch/releases"
+    echo -e "====================================================================\033[0m"
 }
 post_install() {
     info
diff --git a/run.sh b/run.sh
index c0707dc94f0e..5e1a2209c3c0 100755
--- a/run.sh
+++ b/run.sh
@@ -10,7 +10,7 @@ WINEPREFIX="$HOME/.deepinwine/Deepin-WeChat"
 APPDIR="/opt/deepinwine/apps/Deepin-WeChat"
 APPVER="2.6.8.65deepin0"
 WECHAT_INSTALLER="WeChatSetup"
-WECHAT_VER="2.9.0.114"
+WECHAT_VER="2.9.0.123"
 APPTAR="files.7z"
 PACKAGENAME="com.wechat"
 WINE_CMD="wine"
@@ -37,9 +37,12 @@ CallApp()
 
         env WINEPREFIX="$WINEPREFIX" WINEDEBUG=-msvcrt $WINE_CMD "c:\\Program Files\\Tencent\\WeChat\\WeChat.exe" &
 	fi
-	# run 'shadow.exe' if process not exist
-	if [[ -z "$(ps -e | grep -o 'shadow.exe')" ]]; then
-		env WINEPREFIX="$WINEPREFIX" WINEDEBUG=-msvcrt $WINE_CMD "c:\\shadow.exe" &
+
+	if [ ! -f "$WINEPREFIX/deepin" ]; then
+        # run 'shadow.exe' if process not exist
+        if [[ -z "$(ps -e | grep -o 'shadow.exe')" ]]; then
+		    env WINEPREFIX="$WINEPREFIX" WINEDEBUG=-msvcrt $WINE_CMD "c:\\shadow.exe" &
+        fi
 	fi
 }
 ExtractApp()
@@ -102,10 +105,6 @@ CreateBottle()
 
 SwitchToDeepinWine()
 {
-	if [ -d "$WINEPREFIX" ]; then
-		RemoveApp
-		DeployApp
-	fi
 	PACKAGE_MANAGER="yay"
 	if ! [ -x "$(command -v yay)" ]; then
 		if ! [ -x "$(command -v yaourt)" ]; then
@@ -115,9 +114,18 @@ SwitchToDeepinWine()
 			$PACKAGE_MANAGER="yaourt"
 		fi
     fi
+	echo -e "\033[0;34mInstalling dependencies ...\033[0m"
 	$PACKAGE_MANAGER -S deepin-wine xsettingsd lib32-freetype2-infinality-ultimate --needed
+	echo -e "\033[0;34mRedeploying app ...\033[0m"
+	if [ -d "$WINEPREFIX" ]; then
+		RemoveApp
+	fi
+	DeployApp
+	echo -e "\033[0;34mReversing the patch ...\033[0m"
+	patch -p1 -R -d  ${WINEPREFIX} < $APPDIR/reg.patch
+	echo -e "\033[0;34mCreating flag file '$WINEPREFIX/deepin' ...\033[0m"
 	touch -f $WINEPREFIX/deepin
-	echo "Done."
+	echo -e "\033[0;34mDone.\033[0m"
 }
 
 # Init