fix(bundler): kill processes while updating in windows

chore: optimize wix cleanup template (#397) fix: wix template file
libnyanpasu · Feb 7, 2024 · cffd388 · cffd388
1 parent b249ba9
commit cffd388
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/backend/tauri/overrides/nightly.conf.json b/backend/tauri/overrides/nightly.conf.json
@@ -7,7 +7,7 @@
     "updater": {
       "endpoints": [
         "https://mirror.ghproxy.com/https://github.com/keiko233/clash-nyanpasu/releases/download/updater/update-nightly-proxy.json",
-        "https://ghproxy.com/https://github.com/keiko233/clash-nyanpasu/releases/download/updater/update-nightly-proxy.json",
+        "https://gh-proxy.com/https://github.com/keiko233/clash-nyanpasu/releases/download/updater/update-nightly-proxy.json",
         "https://github.com/keiko233/clash-nyanpasu/releases/download/updater/update-nightly.json"
       ]
     }

diff --git a/backend/tauri/tauri.conf.json b/backend/tauri/tauri.conf.json
@@ -74,7 +74,7 @@
       "active": true,
       "endpoints": [
         "https://mirror.ghproxy.com/https://github.com/keiko233/clash-nyanpasu/releases/download/updater/update-proxy.json",
-        "https://ghproxy.com/https://github.com/keiko233/clash-nyanpasu/releases/download/updater/update-proxy.json",
+        "https://gh-proxy.com/https://github.com/keiko233/clash-nyanpasu/releases/download/updater/update-proxy.json",
         "https://github.com/keiko233/clash-nyanpasu/releases/download/updater/update.json"
       ],
       "dialog": false,

diff --git a/backend/tauri/templates/cleanup.wxs b/backend/tauri/templates/cleanup.wxs
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+  xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <Fragment>
     <!-- close nyanpasu processes while install-->
-    <util:CloseApplication Id="NyanpasuCloseApp" Target="Clash Nyanpasu.exe" CloseMessage="yes" RebootPrompt="yes">
-    <util:CloseApplication Id="NyanpasuCloseService" Target="clash-verge-service.exe" CloseMessage="yes" RebootPrompt="yes">
-    <util:CloseApplication Id="NyanpasuCloseMihomo" Target="mihomo.exe" CloseMessage="yes" RebootPrompt="yes">
-    <util:CloseApplication Id="NyanpasuCloseMihomoAlpha" Target="mihomo-alpha.exe" CloseMessage="yes" RebootPrompt="yes">
-    <util:CloseApplication Id="NyanpasuCloseService" Target="clash-rs.exe" CloseMessage="yes" RebootPrompt="yes">
-    <util:CloseApplication Id="NyanpasuCloseService" Target="clash.exe" CloseMessage="yes" RebootPrompt="yes">
-  </util:CloseApplication>
+    <util:CloseApplication Id="NyanpasuCloseApp" Target="Clash Nyanpasu.exe" CloseMessage="yes" RebootPrompt="no" TerminateProcess="1">
+    </util:CloseApplication>
+    <util:CloseApplication Id="NyanpasuCloseService" Target="clash-verge-service.exe" CloseMessage="yes" RebootPrompt="no" TerminateProcess="1">
+    </util:CloseApplication>
+    <util:CloseApplication Id="NyanpasuCloseMihomo" Target="mihomo.exe" CloseMessage="yes" RebootPrompt="no" TerminateProcess="1">
+    </util:CloseApplication>
+    <util:CloseApplication Id="NyanpasuCloseMihomoAlpha" Target="mihomo-alpha.exe" CloseMessage="yes" RebootPrompt="no" TerminateProcess="1">
+    </util:CloseApplication>
+    <util:CloseApplication Id="NyanpasuCloseService" Target="clash-rs.exe" CloseMessage="yes" RebootPrompt="no" TerminateProcess="1">
+    </util:CloseApplication>
+    <util:CloseApplication Id="NyanpasuCloseService" Target="clash.exe" CloseMessage="yes" RebootPrompt="no" TerminateProcess="1">
+    </util:CloseApplication>
   </Fragment>
 </Wix>