summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali kaneko (leap communications) <kali@leap.se>2020-04-22 18:35:27 +0200
committerkali kaneko (leap communications) <kali@leap.se>2020-04-30 22:10:25 +0200
commit498139be7d015023a2cef1dca79e4506edd6f4e5 (patch)
treebdfea62a862cb08929647b8a5092eaed8a61dd2b
parentb3ad57b705e7ad9bbf01aa3586fb15612cec38dc (diff)
[pkg] fail-safe for uninstaller
-rwxr-xr-xbranding/templates/windows/template.nsi8
1 files changed, 7 insertions, 1 deletions
diff --git a/branding/templates/windows/template.nsi b/branding/templates/windows/template.nsi
index e98854f..ce05d27 100755
--- a/branding/templates/windows/template.nsi
+++ b/branding/templates/windows/template.nsi
@@ -98,7 +98,13 @@ Section /o "TAP Virtual Ethernet Adapter" SecTAP
SectionEnd
Section "Uninstall"
- ExecShellWait "runas" "$INSTDIR\bitmask_helper.exe" 'remove'
+ ; this could fail: uninstalling old nssm helper
+ ExecShellWait "runas" '"$INSTDIR\nssm.exe" stop $applicationNameLower-helper'
+ ExecShellWait "runas" '"$INSTDIR\nssm.exe" remove $applicationNameLower-helper confirm'
+
+ ; now we uninstall the new-style go helper
+ ExecShellWait "runas" '"$INSTDIR\bitmask_helper.exe" remove'
+
Delete $INSTDIR\readme.txt
Delete $INSTDIR\helper.log