From 13af5d9f4abc6a0dd5aef91e076ed2bb90779d4f Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 8 Dec 2017 17:53:08 +0100 Subject: [pkg] copy provider certificates on bundles --- pkg/bundles/build.mk | 3 +++ src/leap/bitmask/bonafide/config.py | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/bundles/build.mk b/pkg/bundles/build.mk index b32cfcc0..0def86e4 100644 --- a/pkg/bundles/build.mk +++ b/pkg/bundles/build.mk @@ -25,6 +25,9 @@ bundle: bundle_clean cd pkg/launcher && make cp release-notes.rst $(DIST_VERSION) cp pkg/launcher/bitmask $(DIST_VERSION) + # provider pinning + mkdir -p $(DIST_VERSION)/apps/providers + cp -r src/leap/bitmask/bonafide/providers/* $(DIST_VERSION)/apps/providers/ bundle_linux_gpg: # TODO build it in a docker container! diff --git a/src/leap/bitmask/bonafide/config.py b/src/leap/bitmask/bonafide/config.py index 53a2b2a3..286ec2ac 100644 --- a/src/leap/bitmask/bonafide/config.py +++ b/src/leap/bitmask/bonafide/config.py @@ -162,7 +162,6 @@ def get_pinned_path(domain=None, extension='.json'): filename = domain.encode(sys.getfilesystemencoding()) + extension if STANDALONE: - # TODO: do the bundling part return os.path.join(here(), "..", "apps", "providers", filename) return pkg_resources.resource_filename( -- cgit v1.2.3