[pkg] cross fetch windows openvpn

2 files changed, 20 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 0cb2208..ab93fcf 100755
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,14 @@ openvpn_win:
 	7z e -y -r -ostaging/openvpn/ staging/openvpn/openvpn.tar *.exe
 	copy .\staging\openvpn\openvpn.exe .\staging
 	copy .\staging\openvpn\*.dll .\staging
+openvpn_cross_win:
+	mkdir -p staging/openvpn
+	wget https://build.openvpn.net/downloads/releases/latest/tap-windows-latest-stable.exe -O $(STAGING)/openvpn/tap-windows.exe
+	wget https://downloads.leap.se/thirdparty/windows/openvpn-x86_64-w64-mingw32.tar.bz2 -O $(STAGING)/openvpn/openvpn.tar.bz2
+	tar xvjf $(STAGING)/openvpn/openvpn.tar.bz2 -C $(STAGING)/openvpn/
+	cp $(STAGING)/openvpn/bin/openvpn.exe $(STAGING)/openvpn
+	cp $(STAGING)/openvpn/bin/*.dll $(STAGING)
+	cp $(STAGING)/openvpn/lib/engines-1_1/*.dll $(STAGING)
 helper_win:
 	go build -ldflags "-s -w" -o $(STAGING)/$(HELPER_BIN).exe ./helper
 	upx $(STAGING)/$(HELPER_BIN).exe
diff --git a/osx/generate.py b/osx/generate.py
index 6d73e28..e76a291 100644
--- a/osx/generate.py
+++ b/osx/generate.py
@@ -45,9 +45,18 @@ RULEFILE = os.path.join(here, 'bitmask.pf.conf')
 VPN_UP = os.path.join(here, 'client.up.sh')
 VPN_DOWN = os.path.join(here, 'client.down.sh')
 
-os.makedirs(APP_PATH + "/Contents/MacOS", exist_ok=True)
-os.makedirs(APP_PATH + "/Contents/Resources", exist_ok=True)
-os.makedirs(APP_PATH + "/Contents/helper", exist_ok=True)
+try:
+    os.makedirs(APP_PATH + "/Contents/MacOS")
+except:
+    pass
+try:
+    os.makedirs(APP_PATH + "/Contents/Resources")
+except:
+    pass
+try:
+    os.makedirs(APP_PATH + "/Contents/helper")
+except:
+    pass
 
 vardict = {
     'entrypoint': ENTRYPOINT,