summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali kaneko (leap communications) <kali@leap.se>2020-04-24 20:24:40 +0200
committerkali kaneko (leap communications) <kali@leap.se>2020-04-30 22:10:32 +0200
commit37ed577a6b8de8a43fb67f30e7a0c7460a4c04a9 (patch)
tree19fdc637d4f228932ebcf4e20d7be76a7d116bf3
parenta14b4ac6507b65d9b2d5e22ff89cf89c689cd936 (diff)
[bug] stop/remove new, renamed service
-rw-r--r--Makefile1
-rwxr-xr-xbranding/templates/windows/template.nsi3
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ec642b2..709bdb1 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,6 @@ dependsCygwin:
@choco install -y golang python nssm nsis wget 7zip
build:
- echo "XBUILD>", ${XBUILD}
ifeq (${XBUILD}, yes)
$(MAKE) build_cross_win
$(MAKE) build_cross_osx
diff --git a/branding/templates/windows/template.nsi b/branding/templates/windows/template.nsi
index 9c319d0..e3b2379 100755
--- a/branding/templates/windows/template.nsi
+++ b/branding/templates/windows/template.nsi
@@ -63,6 +63,9 @@ Section "InstallFiles"
DetailPrint "Trying to uninstall new helper..."
ClearErrors
+ ExecWait '"$INSTDIR\helper.exe" stop'
+ ExecWait '"$INSTDIR\helper.exe" remove'
+ ClearErrors
Delete 'C:\Program Files\$applicationName\helper.exe'
IfErrors 0 noErrorHelper