[pkg] abort install if we running an old version0.21.2

stop if:

- bitmask is running (we don't want to mess with the helper if the app
  is running)
- we cannot stop the service for some reason.

powershell gives more flexibility to stop services, but Remove-Service
is not present in PS < 6, so we try to remove the service from the
post-install too (the golang helper will complain about an eventlog
registry key).

this could probably be improved in the helper, but we'll be moving to
the official openvpnserv2 service for 0.21.4. we might want to revisit
the current helper for the firewall/killswitch.

1 files changed, 16 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 0cd6c88..ef6bf91 100644
--- a/Makefile
+++ b/Makefile
@@ -109,21 +109,26 @@ lib/%.a: $(PKGFILES)
 
 relink_vendor:
 	@echo "============RELINK VENDOR============="
-	@echo "PLATFORM: ${PLATFORM}"
+	@echo "PLATFORM: ${PLATFORM} (${UNAME})"
 	@echo "VENDOR_PATH: ${VENDOR_PATH}"
 	@echo "PROVIDER: ${PROVIDER}"
-ifeq ($(UNAME), CYGWIN_NT-10.0)
-	[ -L providers/assets ] || (CYGWIN=winsymlinks:nativestrict ln -s ${PROVIDER}/assets providers/assets)
-endif
-ifneq ($(UNAME), CYGWIN_NT-10.0)
 ifeq ($(PLATFORM), windows)
-	rm -rf providers/assets
+	@rm -rf providers/assets || true
+ifeq ($(UNAME), MINGW64_NT-10.0)
+ifeq ($(VENDOR_PATH), providers)
+	@cp -r providers/${PROVIDER}/assets providers/assets || true
 endif
+endif # end mingw
+ifeq ($(UNAME), CYGWIN_NT-10.0)
+	@[ -L providers/assets ] || (CYGWIN=winsymlinks:nativestrict ln -s ${PROVIDER}/assets providers/assets)
+endif # end cygwin
+else # not windows: linux/osx
 ifeq ($(VENDOR_PATH), providers)
 	@unlink providers/assets || true
 	@ln -s ${PROVIDER}/assets providers/assets || true
 endif
 endif
+
 	@echo "============RELINK VENDOR============="
 
 build_golib: lib/libgoshim.a
@@ -210,11 +215,14 @@ else
 	@cp ${VENDOR_PATH}/assets/icon.ico ${INST_DATA}/icon.ico
 endif
 	@cp ${QTBUILD}/release/${TARGET}.exe ${INST_DATA}${TARGET}.exe
-	# FIXME get the signed binaries with curl from openvpn downloads page - see if we have to adapt the openvpn-build to install tap drivers etc from our installer.
+	# FIXME get the signed binaries with curl from openvpn downloads page.
 	@cp "/c/Program Files/OpenVPN/bin/openvpn.exe" ${INST_DATA}
 	@cp "/c/Program Files/OpenVPN/bin/"*.dll ${INST_DATA}
+ifeq (${RELEASE}, yes)
+	@windeployqt --release --qmldir gui/qml ${INST_DATA}${TARGET}.exe
+else
 	@windeployqt --qmldir gui/qml ${INST_DATA}${TARGET}.exe
-	#@windeployqt --release --qmldir gui/qml ${INST_DATA}${TARGET}.exe
+endif
 	# TODO stage it to shave some time
 	@wget ${TAP_WINDOWS} -O ${INST_DATA}/tap-windows.exe
 endif