summaryrefslogtreecommitdiff
path: root/pkg/bundles
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2018-02-14 02:22:23 +0100
committerKali Kaneko <kali@leap.se>2018-02-15 16:36:55 +0100
commitbfda65b93510d8f1e0e8c8e9a95a245ac4524f4c (patch)
treea0552d231ba4e368dda244e6e8091b1135ad835d /pkg/bundles
parentd39adbba2883697fd5b7ec69b46cafd535efe021 (diff)
[pkg] fixes for bundle script
Diffstat (limited to 'pkg/bundles')
-rw-r--r--pkg/bundles/build.mk24
1 files changed, 16 insertions, 8 deletions
diff --git a/pkg/bundles/build.mk b/pkg/bundles/build.mk
index 90eeb946..837b3389 100644
--- a/pkg/bundles/build.mk
+++ b/pkg/bundles/build.mk
@@ -138,11 +138,19 @@ bundle_headless:
bundle_anonvpn:
pyinstaller -y pkg/pyinst/anonvpn.spec
- cp src/leap/bitmask/core/bitmaskd.tac $(DIST)
- cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(DIST)/
- echo `git describe` > $(HEADLESS_DIST)/version
- mv $(DIST) _bundlelib && mkdir $(DIST_VERSION) && mv _bundlelib $(DIST_VERSION)lib/
- mkdir -p $(DIST_VERSION)/apps/providers
- cp -r src/leap/bitmask/bonafide/providers/* $(DIST_VERSION)/apps/providers/
-
-bundle_anonvpn_linux: bundle_anonvpn bundle_linux_vpn bundle_linux_helpers
+ cp src/leap/bitmask/core/bitmaskd.tac $(ANONVPN_DIST)
+ cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(ANONVPN_DIST)/
+ cho `git describe` > $(ANONVPN_DIST)/version
+ mv $(ANONVPN_DIST) _bundlelib && mkdir $(ANONVPN_DIST_VERSION) && mv _bundlelib $(ANONVPN_DIST_VERSION)lib/
+ mkdir -p $(ANONVPN_DIST_VERSION)/apps/providers
+ cp -r src/leap/bitmask/bonafide/providers/* $(ANONVPN_DIST_VERSION)/apps/providers/
+
+ # openvpn
+ mkdir -p $(ANONVPN_DIST_VERSION)/apps/vpn
+ wget https://downloads.leap.se/thirdparty/linux/openvpn/openvpn-x64 -O $(ANONVPN_DIST_VERSION)/apps/vpn/openvpn.leap
+ # helpers
+ mkdir -p $(ANONVPN_DIST_VERSION)/apps/helpers
+ cp src/leap/bitmask/vpn/helpers/linux/bitmask-root $(ANONVPN_DIST_VERSION)/apps/helpers/
+ cp src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.bundle.policy $(ANONVPN_DIST_VERSION)/apps/helpers/
+
+bundle_anonvpn_linux: bundle_anonvpn