4 files changed, 29 insertions, 14 deletions
diff --git a/branding/templates/makefile/Makefile b/branding/templates/makefile/Makefile
index 859118f..5994e19 100755
--- a/branding/templates/makefile/Makefile
+++ b/branding/templates/makefile/Makefile
@@ -37,7 +37,8 @@ else
 pkg_win: staging/openvpn/openvpn.exe
 	echo "[+] building windows"
 	cp ../bin/windows/bitmask-vpn staging/bitmask-vpn.exe
-	cp ../bin/windows/bitmask-helper staging/bitmask_helper.exe
+	#cp ../bin/windows/bitmask-helper staging/bitmask_helper.exe
+	cp ../bin/windows/bitmask-helper-go staging/helper.exe
 	makensis windows/$(APPNAME)-installer.nsi
 	mv dist/$(APPNAME)-$(VERSION).exe ../../deploy/
 endif
diff --git a/branding/templates/windows/payload/install b/branding/templates/windows/payload/install
index da9a195..280703a 100755
--- a/branding/templates/windows/payload/install
+++ b/branding/templates/windows/payload/install
@@ -1,4 +1,4 @@
-..\staging\bitmask_helper.exe
+..\staging\helper.exe
 ..\staging\bitmask-vpn.exe
 ..\staging\libcrypto-1_1-x64.dll
 ..\staging\liblzo2-2.dll
diff --git a/branding/templates/windows/payload/uninstall b/branding/templates/windows/payload/uninstall
index f0a1687..bb6cf39 100755
--- a/branding/templates/windows/payload/uninstall
+++ b/branding/templates/windows/payload/uninstall
@@ -1,13 +1,14 @@
 icon.ico
-openssl.exe
-openvpn.exe
-ssleay32.dll
-libeay32.dll
-liblzo2-2.dll
-libpkcs11-helper-1.dll
+openssl.exe
+openvpn.exe
+ssleay32.dll
+libeay32.dll
+liblzo2-2.dll
+libpkcs11-helper-1.dll
 libcrypto-1_1-x64.dll
 libssl-1_1-x64.dll
 padlock.dll
-bitmask-helper.exe
+bitmask_helper.exe
 bitmask-vpn.exe
 tap-windows.exe
+helper.exe
diff --git a/branding/templates/windows/template.nsi b/branding/templates/windows/template.nsi
index f6a908d..9c319d0 100755
--- a/branding/templates/windows/template.nsi
+++ b/branding/templates/windows/template.nsi
@@ -61,6 +61,11 @@ Section "InstallFiles"
   Delete 'C:\Program Files\$applicationName\bitmask_helper.exe'
   IfErrors 0 noErrorHelper
 
+  DetailPrint "Trying to uninstall new helper..."
+  ClearErrors
+  Delete 'C:\Program Files\$applicationName\helper.exe'
+  IfErrors 0 noErrorHelper
+
   ; uninstalling old nssm helper - could fail if it isn't there, or if nssm is not there...
   ClearErrors
   DetailPrint "Trying to uninstall an old style helper..."
@@ -77,6 +82,12 @@ Section "InstallFiles"
   IfErrors 0 noErrorHelper
   DetailPrint "Failed to stop new-style helper, maybe it was not there"
 
+  ClearErrors
+  DetailPrint "Trying to uninstall a new style helper..."
+  ExecWait '"$INSTDIR\helper.exe" stop'
+  IfErrors 0 noErrorHelper
+  DetailPrint "Failed to stop new-style helper, maybe it was not there"
+
   noErrorHelper:
   
   ; now we try to delete the systray, locked by the app - just to know if another instance of FoobarVPN is running.
@@ -120,14 +131,14 @@ SectionEnd
 Section "InstallService"
   DetailPrint "Trying to uninstall previous versions of the (new) helper..."
   ClearErrors
-  ExecWait '"$INSTDIR\bitmask_helper.exe" stop'
-  ExecWait '"$INSTDIR\bitmask_helper.exe" remove'
+  ExecWait '"$INSTDIR\helper.exe" stop'
+  ExecWait '"$INSTDIR\helper.exe" remove'
   IfErrors 0 noError
   DetailPrint "Could not uninstall a previous version of the (new) helper!"
 
   noError:
-  ExecWait '"$INSTDIR\bitmask_helper.exe" install'
-  ExecWait '"$INSTDIR\bitmask_helper.exe" start'
+  ExecWait '"$INSTDIR\helper.exe" install'
+  ExecWait '"$INSTDIR\helper.exe" start'
 SectionEnd
 
 Section /o "TAP Virtual Ethernet Adapter" SecTAP
@@ -147,9 +158,11 @@ Section "Uninstall"
   ExecWait '"$INSTDIR\bitmask_helper.exe" stop'
   ExecWait '"$INSTDIR\bitmask_helper.exe" remove'
 
+  ExecWait '"$INSTDIR\helper.exe" stop'
+  ExecWait '"$INSTDIR\helper.exe" remove'
+
   ; now we (try to) remove everything else. kill it with fire!
   Delete $INSTDIR\nssm.exe ; probably does not exist anymore, but just in case
-  Delete $INSTDIR\bitmask_helper.exe
   Delete $INSTDIR\readme.txt
   Delete $INSTDIR\helper.log
   Delete $INSTDIR\openvpn.log