From 38ee8aedc12e7551bed952b76bbb86aa43b0621e Mon Sep 17 00:00:00 2001
From: MystiPanda <mystipanda@proton.me>
Date: Fri, 2 Feb 2024 15:53:28 +0800
Subject: [PATCH] fix: Fix Nisi Error

---
 src-tauri/tauri.linux.conf.json                       | 2 +-
 src-tauri/tauri.windows.conf.json                     | 2 +-
 src-tauri/{ => template}/clash-verge.desktop          | 0
 {scripts/windows => src-tauri/template}/installer.nsi | 8 +++++---
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename src-tauri/{ => template}/clash-verge.desktop (100%)
 rename {scripts/windows => src-tauri/template}/installer.nsi (99%)

diff --git a/src-tauri/tauri.linux.conf.json b/src-tauri/tauri.linux.conf.json
index fc152ebc..d5d75455 100644
--- a/src-tauri/tauri.linux.conf.json
+++ b/src-tauri/tauri.linux.conf.json
@@ -7,7 +7,7 @@
       "targets": ["deb", "appimage", "updater"],
       "deb": {
         "depends": ["openssl"],
-        "desktopTemplate": "./clash-verge.desktop"
+        "desktopTemplate": "./template/clash-verge.desktop"
       }
     }
   }
diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json
index 08f8e66d..bd2ac51c 100644
--- a/src-tauri/tauri.windows.conf.json
+++ b/src-tauri/tauri.windows.conf.json
@@ -19,7 +19,7 @@
           "languages": ["SimpChinese", "English"],
           "license": "../LICENSE",
           "installMode": "perMachine",
-          "template": "../scripts/windows/installer.nsi"
+          "template": "./template/installer.nsi"
         }
       }
     }
diff --git a/src-tauri/clash-verge.desktop b/src-tauri/template/clash-verge.desktop
similarity index 100%
rename from src-tauri/clash-verge.desktop
rename to src-tauri/template/clash-verge.desktop
diff --git a/scripts/windows/installer.nsi b/src-tauri/template/installer.nsi
similarity index 99%
rename from scripts/windows/installer.nsi
rename to src-tauri/template/installer.nsi
index 7eddee62..1ffd23da 100644
--- a/scripts/windows/installer.nsi
+++ b/src-tauri/template/installer.nsi
@@ -148,7 +148,6 @@ Function PageReinstall
   ; however, this should be fine since the user will have to confirm the uninstallation
   ; and they can chose to abort it if doesn't make sense.
   StrCpy $0 0
-  !insertmacro CheckAllVergeProcesses
 
   wix_loop:
     EnumRegKey $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" $0
@@ -440,6 +439,7 @@ FunctionEnd
             nsis_tauri_utils::KillProcessCurrentUser "clash-verge-service.exe"
         !else
             nsis_tauri_utils::KillProcess "clash-verge-service.exe"
+        !endif
     ${EndIf}
 
        
@@ -451,6 +451,7 @@ FunctionEnd
             nsis_tauri_utils::KillProcessCurrentUser "clash-meta-alpha.exe"
         !else
             nsis_tauri_utils::KillProcess "clash-meta-alpha.exe"
+        !endif
     ${EndIf}
 
     ; Check if clash-meta.exe is running
@@ -461,6 +462,7 @@ FunctionEnd
             nsis_tauri_utils::KillProcessCurrentUser "clash-meta.exe"
         !else
             nsis_tauri_utils::KillProcess "clash-meta.exe"
+        !endif
     ${EndIf}
 !macroend
 
@@ -589,7 +591,7 @@ Section Install
   SetOutPath $INSTDIR
 
   !insertmacro CheckIfAppIsRunning
-
+  !insertmacro CheckAllVergeProcesses
   ; Copy main executable
   File "${MAINBINARYSRCPATH}"
 
@@ -676,7 +678,7 @@ FunctionEnd
 
 Section Uninstall
   !insertmacro CheckIfAppIsRunning
-
+  !insertmacro CheckAllVergeProcesses
   ; Delete the app directory and its content from disk
   ; Copy main executable
   Delete "$INSTDIR\${MAINBINARYNAME}.exe"