generate 'PACKAGE_VERSION' file after installation.

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

5 files changed, 45 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b16781a4c691..9f7f7c416853 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,7 +8,7 @@ pkgbase = deepin-wine-tim
 	license = custom
 	depends = p7zip
 	depends = deepin-wine5
-	depends = deepin-wine-helper
+	depends = deepin-wine-helper>=5.1.30_1-1
 	depends = xorg-xwininfo
 	depends = wqy-microhei
 	depends = lib32-alsa-lib
@@ -26,7 +26,7 @@ pkgbase = deepin-wine-tim
 	source = share.7z
 	md5sums = 5fdc20e614d945bd2ba5251420872479
 	md5sums = e5b97081022766415bd22d21fba706f6
-	md5sums = 52fa83c9d78d421cf91ef1f3e9a79dbb
+	md5sums = cb8c2f007930241730cede526094fae5
 	md5sums = 479ae2a04a9c5dcc08c67c7b1395a944
 
 pkgname = deepin-wine-tim
diff --git a/PKGBUILD b/PKGBUILD
index c804b5ca6d0d..b48eee20673e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc="Tencent TIM on Deepin Wine5(${timpkgname}) For Archlinux"
 arch=("x86_64")
 url="https://tim.qq.com/"
 license=('custom')
-depends=('p7zip' 'deepin-wine5' 'deepin-wine-helper' 'xorg-xwininfo' 'wqy-microhei' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-libpulse' 'lib32-openal' 'lib32-mpg123' 'lib32-gnutls')
+depends=('p7zip' 'deepin-wine5' 'deepin-wine-helper>=5.1.30_1-1' 'xorg-xwininfo' 'wqy-microhei' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-libpulse' 'lib32-openal' 'lib32-mpg123' 'lib32-gnutls')
 conflicts=('wine-tim' 'deepin.com.qq.office' 'deepin-tim-for-arch')
 install="deepin-wine-tim.install"
 _mirror="https://com-store-packages.uniontech.com"
@@ -20,7 +20,7 @@ source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${debpkgv
   "share.7z")
 md5sums=('5fdc20e614d945bd2ba5251420872479'
   'e5b97081022766415bd22d21fba706f6'
-  '52fa83c9d78d421cf91ef1f3e9a79dbb'
+  'cb8c2f007930241730cede526094fae5'
   '479ae2a04a9c5dcc08c67c7b1395a944')
 
 build() {
diff --git a/README.md b/README.md
index c18a0618d3af..d574161dec2e 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ Deepin 打包的 QQ 容器(`com.qq.im.deepin`)移植到 Archlinux，QQ 环境修
     - [从 `wine`/`deepin-wine 2.x` 迁移](#从-winedeepin-wine-2x-迁移)
 - [卸载](#卸载)
 - [常见问题及解决](#常见问题及解决)
+    - [QQ 安全组件异常](#qq-安全组件异常)
     - [不能记住密码](#不能记住密码)
     - [网络连接状态改变后不能重连](#网络连接状态改变后不能重连)
     - [高分辨率屏幕支持](#高分辨率屏幕支持)
@@ -115,8 +116,6 @@ EXEC_PATH="c:/Program Files/Tencent/TIM/Bin/TIM.exe"
 ```
 改为修改后的安装路径，否则只有安装后第一次能够运行
 
-:bulb: **NOTE: 前几次运行时可能会提示 "qq安全组件异常"，等一会再运行或重启一下系统**
-
 ## 设置
 
 dpi，目录映射等可以在 `winecfg` 进行设置，打开 `winecfg` 的命令为：
@@ -137,11 +136,11 @@ dpi，目录映射等可以在 `winecfg` 进行设置，打开 `winecfg` 的命�
 
 ## 切换到 `deepin-wine`
 
-:warning: `deepin-wine-tim` 从 `v3.3.8.22043-2` 开始，默认使用AUR仓库 [deepin-wine5](https://aur.archlinux.org/packages/deepin-wine5/)，无需再进行任何切换操作，对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/run.sh)。
+:warning: `deepin-wine-tim` 从 `v3.3.8.22043-2` 开始，默认使用AUR仓库 [deepin-wine5](https://aur.archlinux.org/packages/deepin-wine5/)，无需再进行任何切换操作，对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/README.md)。
 
 ### 自动切换(推荐)
 
-对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/run.sh)。
+对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/README.md)。
 
 ### 从 `wine`/`deepin-wine 2.x` 迁移
 
@@ -181,13 +180,17 @@ TIM在本地保存的数据不会被删除，如保存在用户文档下的数�
 
 ## 常见问题及解决
 
+### QQ 安全组件异常
+
+前几次运行时可能会出现该问题，等一会再运行或重启一下系统即可。
+
 ### 不能记住密码
 
-对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/run.sh)。
+对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/README.md)。
 
 ### 网络连接状态改变后不能重连
 
-对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/run.sh)。
+对于之前的版本，可以查看[旧版README](https://github.com/vufa/deepin-wine-tim-arch/blob/16e288a7288d0d19e3fb2f7b93a3c5aa7a8f5129/README.md)。
 
 ### 高分辨率屏幕支持
 
diff --git a/deepin-wine-tim.install b/deepin-wine-tim.install
index 0a818f614875..dab83cfe487b 100644
--- a/deepin-wine-tim.install
+++ b/deepin-wine-tim.install
@@ -1,5 +1,7 @@
 info() {
     echo -e "\033[0;34m============================提示/INFO==============================="
+    echo -e "* 常见问题及解决(Troubleshoot):"
+    echo -e "  https://github.com/vufa/deepin-wine-tim-arch"
     echo -e "* 反馈问题(Report issue):"
     echo -e "  https://github.com/vufa/deepin-wine-tim-arch/issues"
     echo -e "* 安装包下载(Installation package download):"
diff --git a/run.sh b/run.sh
index 91aad757e097..485d53c0c7d1 100755
--- a/run.sh
+++ b/run.sh
@@ -12,8 +12,10 @@ version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1";
 BOTTLENAME="Deepin-TIM"
 APPVER="9.3.2deepin20"
 WINEPREFIX="$HOME/.deepinwine/$BOTTLENAME"
+TIM_FONTS="$WINEPREFIX/drive_c/windows/Fonts"
 TIM_VER="3.3.9.22051"
 EXEC_PATH="c:/Program Files/Tencent/TIM/Bin/TIM.exe"
+EXEC_FILE="$WINEPREFIX/drive_c/Program Files/Tencent/TIM/Bin/TIM.exe"
 START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
 TIM_INSTALLER_PATH="c:/Program Files/Tencent/TIM$TIM_VER.exe"
 export MIME_TYPE=""
@@ -32,6 +34,28 @@ OpenWinecfg()
     env WINEPREFIX=$WINEPREFIX $APPRUN_CMD winecfg
 }
 
+DeployApp()
+{
+    # backup fonts
+    if [ -d "$TIM_FONTS" ];then
+        mkdir -p $HOME/.deepinwine/.tim_tmp
+        cp $TIM_FONTS/* $HOME/.deepinwine/.tim_tmp/
+    fi
+
+    # re-deploy bottle
+    rm -rf "$WINEPREFIX"
+    # run installer
+    env LC_ALL=zh_CN.UTF-8 WINEDLLOVERRIDES="winemenubuilder.exe=d" $START_SHELL_PATH $BOTTLENAME $APPVER "$TIM_INSTALLER_PATH" "$@"
+
+    # restore fonts
+    if [ -d "$HOME/.deepinwine/.tim_tmp" ];then
+        cp -n $HOME/.deepinwine/.tim_tmp/* $TIM_FONTS/
+        rm -rf "$HOME/.deepinwine/.tim_tmp"
+    fi
+    touch $WINEPREFIX/reinstalled
+    cat /opt/apps/$DEB_PACKAGE_NAME/files/files.md5sum > $WINEPREFIX/PACKAGE_VERSION
+}
+
 Run()
 {
     if [ -z "$DISABLE_ATTACH_FILE_DIALOG" ];then
@@ -40,9 +64,13 @@ Run()
 
     if [ -n "$EXEC_PATH" ];then
         if [ ! -f "$WINEPREFIX/reinstalled" ];then
-            env LC_ALL=zh_CN.UTF-8 WINEDLLOVERRIDES="winemenubuilder.exe=d" $START_SHELL_PATH $BOTTLENAME $APPVER "$TIM_INSTALLER_PATH" "$@"
-            touch $WINEPREFIX/reinstalled
+            DeployApp
         else
+            # missing exec file
+            if [ ! -f "$EXEC_FILE" ];then
+                DeployApp
+            fi
+
             env LC_ALL=zh_CN.UTF-8 $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
         fi
     else