[pkg] compile and pack helper

Makefile

+SYSTRAY := 0xacab.org/leap/bitmask-systray
+STAGING := staging
 
-build_osx:
-	echo "[+] building osx"
-build_win:
+deps_win:
+	choco install -y golang python upx nssm nsis
+helper_win:
+	go build -ldflags "-s -w" -o $(STAGING)/bitmask_helper.exe .\helper
+	upx $(STAGING)/bitmask_helper.exe
+systray_win:
+	go get -u $(SYSTRAY)
+	go build -tags "standalone" -ldflags "-H windowsgui -s -w" -o $(STAGING)/bitmask-systray.exe $(SYSTRAY)
+build_win: helper_win
+	echo "[+] building windows"
 	if not exist dist mkdir dist
 	make -C win
-	echo "[+] building windows"
 	"C:\Program Files (x86)\NSIS\makensis.exe" win/RiseupVPN-installer.nsi
+build_osx:
+	echo "[+] building osx"
 build_snap:
 	echo "[+] building snap"

README.txt

@@ -21,3 +21,9 @@ Dependencies (Windows)
 
 * nsis
 * nssm
+
+Building (Windows)
+------------------------
+
+make deps_win
+make build_win

win/template.nsi

 !include "MUI.nsh"
 
 Name "$app_name"
-RequestExecutionLevel admin
-
 Outfile "..\dist\$app_name-installer.exe"
 ;TODO make the installdir configurable - and set it in the registry.
 InstallDir "C:\Program Files\$app_name\"
+RequestExecutionLevel admin
 
 
 !define BITMAP_FILE riseupvpn.bmp
@@ -78,6 +77,9 @@ Section "InstallService"
   ExecWait '"$INSTDIR\nssm.exe" set $app_name_lower-helper AppDirectory "$INSTDIR"'
   ExecWait '"$INSTDIR\nssm.exe" start $app_name_lower-helper'
 
+  ; why are these here?
+  Delete "C:\$app_name_lower.ico"
+  Delete "C:\$app_name_lower.png"
 SectionEnd
 
 Section "Uninstall"