fix(nsis): removing service before uninstall it

eythaann · Jan 14, 2025 · 0943dfd · 0943dfd
1 parent 1139875
commit 0943dfd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/templates/installer-hooks.nsh b/templates/installer-hooks.nsh
@@ -6,7 +6,9 @@
   ; Refresh file associations icons
   !insertmacro UPDATEFILEASSOC
   ; Create the app service
-  ExecWait '"$INSTDIR\slu-service.exe" install'
+  FILE "${__FILEDIR__}\..\..\slu-service.exe"
+  nsExec::Exec '"$INSTDIR\slu-service.exe" install'
+  Pop $0
 !macroend
 
 !macro NSIS_HOOK_PREUNINSTALL
@@ -17,5 +19,7 @@
   ; Refresh file associations icons
   !insertmacro UPDATEFILEASSOC
   ; Delete the app service
-  ExecWait '"$INSTDIR\slu-service.exe" uninstall'
+  nsExec::Exec '"$INSTDIR\slu-service.exe" uninstall'
+  Pop $0
+  Delete "$INSTDIR\slu-service.exe"
 !macroend
diff --git a/templates/installer.nsi b/templates/installer.nsi
@@ -627,7 +627,6 @@ Section Install
   ; Copy main executable
   File "${MAINBINARYSRCPATH}"
   FILE "${__FILEDIR__}\..\..\seelen_ui.pdb"
-  FILE "${__FILEDIR__}\..\..\slu-service.exe"
 
   ; Copy resources
   {{#each resources_dirs}}
@@ -768,7 +767,6 @@ Section Uninstall
   ; Copy main executable
   Delete "$INSTDIR\${MAINBINARYNAME}.exe"
   Delete "$INSTDIR\seelen_ui.pdb"
-  Delete "$INSTDIR\slu-service.exe"
 
   ; Delete resources
   {{#each resources}}