Austin/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2024-11-16 11:42:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Fix Nisi Error

Browse Source
This commit is contained in:
MystiPanda 2024-02-02 15:53:28 +08:00
parent d4623e4175
commit d0206044dc
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src-tauri/tauri.linux.conf.json
View File

@ -7,7 +7,7 @@
"targets": ["deb", "appimage", "updater"], "targets": ["deb", "appimage", "updater"],
"deb": { "deb": {
"depends": ["openssl"], "depends": ["openssl"],
"desktopTemplate": "./clash-verge.desktop" "desktopTemplate": "./template/clash-verge.desktop"
} }
} }
} }

2
src-tauri/tauri.windows.conf.json
View File

@ -19,7 +19,7 @@
"languages": ["SimpChinese", "English"], "languages": ["SimpChinese", "English"],
"license": "../LICENSE", "license": "../LICENSE",
"installMode": "perMachine", "installMode": "perMachine",
"template": "../scripts/windows/installer.nsi" "template": "./template/installer.nsi"
} }
} }
} }

0
src-tauri/clash-verge.desktop → src-tauri/template/clash-verge.desktop
View File

8
scripts/windows/installer.nsi → src-tauri/template/installer.nsi
View File

@ -148,7 +148,6 @@ Function PageReinstall
; however, this should be fine since the user will have to confirm the uninstallation ; 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. ; and they can chose to abort it if doesn't make sense.
StrCpy $0 0 StrCpy $0 0
!insertmacro CheckAllVergeProcesses
wix_loop: wix_loop:
EnumRegKey $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" $0 EnumRegKey $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" $0
@ -440,6 +439,7 @@ FunctionEnd
nsis_tauri_utils::KillProcessCurrentUser "clash-verge-service.exe" nsis_tauri_utils::KillProcessCurrentUser "clash-verge-service.exe"
!else !else
nsis_tauri_utils::KillProcess "clash-verge-service.exe" nsis_tauri_utils::KillProcess "clash-verge-service.exe"
!endif
${EndIf} ${EndIf}
@ -451,6 +451,7 @@ FunctionEnd
nsis_tauri_utils::KillProcessCurrentUser "clash-meta-alpha.exe" nsis_tauri_utils::KillProcessCurrentUser "clash-meta-alpha.exe"
!else !else
nsis_tauri_utils::KillProcess "clash-meta-alpha.exe" nsis_tauri_utils::KillProcess "clash-meta-alpha.exe"
!endif
${EndIf} ${EndIf}
; Check if clash-meta.exe is running ; Check if clash-meta.exe is running
@ -461,6 +462,7 @@ FunctionEnd
nsis_tauri_utils::KillProcessCurrentUser "clash-meta.exe" nsis_tauri_utils::KillProcessCurrentUser "clash-meta.exe"
!else !else
nsis_tauri_utils::KillProcess "clash-meta.exe" nsis_tauri_utils::KillProcess "clash-meta.exe"
!endif
${EndIf} ${EndIf}
!macroend !macroend
@ -589,7 +591,7 @@ Section Install
SetOutPath $INSTDIR SetOutPath $INSTDIR
!insertmacro CheckIfAppIsRunning !insertmacro CheckIfAppIsRunning
!insertmacro CheckAllVergeProcesses
; Copy main executable ; Copy main executable
File "${MAINBINARYSRCPATH}" File "${MAINBINARYSRCPATH}"
@ -676,7 +678,7 @@ FunctionEnd
Section Uninstall Section Uninstall
!insertmacro CheckIfAppIsRunning !insertmacro CheckIfAppIsRunning
!insertmacro CheckAllVergeProcesses
; Delete the app directory and its content from disk ; Delete the app directory and its content from disk
; Copy main executable ; Copy main executable
Delete "$INSTDIR\${MAINBINARYNAME}.exe" Delete "$INSTDIR\${MAINBINARYNAME}.exe"