re-deploy bollte after reinstalling.

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

3 files changed, 28 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc99b4fa2071..319ed5f6fbc8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -29,6 +29,6 @@ pkgbase = deepin-wine-wechat
 	md5sums = d81ce735e25cf79ac90bdc2c87020d13
 	md5sums = cf87ad9db0bf279ddf9e5c1dce64a716
 	md5sums = 531a3997ea28e8fc0f47e9e136dae332
-	md5sums = 407a69a6359b429e74c503ff9b389c7c
+	md5sums = 1e8a5ac849f34da178a2f1f7f4d86fbd
 
 pkgname = deepin-wine-wechat
diff --git a/PKGBUILD b/PKGBUILD
index db0bf3611b6f..1875b5ce9452 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,7 +26,7 @@ md5sums=('940b59d57536a1e43bc9fc6f61d675ca'
          'd81ce735e25cf79ac90bdc2c87020d13'
          'cf87ad9db0bf279ddf9e5c1dce64a716'
          '531a3997ea28e8fc0f47e9e136dae332'
-         '407a69a6359b429e74c503ff9b389c7c')
+         '1e8a5ac849f34da178a2f1f7f4d86fbd')
 
 build() {
   msg "Extracting DPKG package ..."
diff --git a/run.sh b/run.sh
index 4e3d9d94d380..8f6a8c0585c4 100755
--- a/run.sh
+++ b/run.sh
@@ -39,6 +39,27 @@ OpenWinecfg()
     env WINEPREFIX=$WINEPREFIX $APPRUN_CMD winecfg
 }
 
+DeployApp()
+{
+    # backup fonts
+    if [ -d "$WECHAT_FONTS" ];then
+        mkdir -p $HOME/.deepinwine/.wechat_tmp
+        cp $WECHAT_FONTS/* $HOME/.deepinwine/.wechat_tmp/
+    fi
+
+    # re-deploy bottle
+    rm -rf "$WINEPREFIX"
+    # run installer
+    env WINEDLLOVERRIDES="winemenubuilder.exe=d" $START_SHELL_PATH $BOTTLENAME $APPVER "$WECHAT_INSTALLER_PATH" "$@"
+
+    # restore fonts
+    if [ -d "$HOME/.deepinwine/.wechat_tmp" ];then
+        cp -n $HOME/.deepinwine/.wechat_tmp/* $WECHAT_FONTS/
+        rm -rf "$HOME/.deepinwine/.wechat_tmp"
+    fi
+    touch $WINEPREFIX/reinstalled
+}
+
 Run()
 {
     if [ -z "$DISABLE_ATTACH_FILE_DIALOG" ];then
@@ -51,22 +72,13 @@ Run()
 
     if [ -n "$EXEC_PATH" ];then
         if [ ! -f "$WINEPREFIX/reinstalled" ];then
-            # backup fonts
-            if [ -d "$WECHAT_FONTS" ];then
-                mkdir $HOME/.deepinwine/.wechat_tmp
-                cp "$WECHAT_FONTS/*" "$HOME/.deepinwine/.wechat_tmp/"
+            DeployApp
+        else
+            # missing exec file
+            if [ ! -d "$EXEC_PATH" ];then
+                DeployApp
             fi
 
-            # run installer
-            env WINEDLLOVERRIDES="winemenubuilder.exe=d" $START_SHELL_PATH $BOTTLENAME $APPVER "$WECHAT_INSTALLER_PATH" "$@"
-
-            # restore fonts
-            if [ -d "$HOME/.deepinwine/.wechat_tmp" ];then
-                cp -n "$HOME/.deepinwine/.wechat_tmp/*" "$WECHAT_FONTS/"
-                rm -rf "$HOME/.deepinwine/.wechat_tmp"
-            fi
-            touch $WINEPREFIX/reinstalled
-        else
             if [ -z "${EXEC_PATH##*.lnk*}" ];then
                 $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
             else