From 0cc95f1df0641606f0173226e6f1b9f44112f962 Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Mon, 1 May 2017 17:10:39 +0200 Subject: [bug] include bitmask_helpers into the frozen binary The bundled version of bitmask is unable to find the bitmask_helpers binary. Let's include it as part of the frozen binary generated by pyinstaller. - Resolves: #8862 --- src/leap/bitmask/vpn/_config.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/leap/bitmask/vpn/_config.py') diff --git a/src/leap/bitmask/vpn/_config.py b/src/leap/bitmask/vpn/_config.py index 5f10734d..421d15a6 100644 --- a/src/leap/bitmask/vpn/_config.py +++ b/src/leap/bitmask/vpn/_config.py @@ -1,14 +1,24 @@ +import os.path import pkg_resources -from .constants import IS_LINUX +from .constants import IS_LINUX +from leap.bitmask.util import STANDALONE, here if IS_LINUX: def get_bitmask_helper_path(): + if STANDALONE: + return os.path.join(here(), "..", "apps", "helpers", + "bitmask-root") + return pkg_resources.resource_filename( 'leap.bitmask.vpn.helpers.linux', 'bitmask-root') def get_bitmask_polkit_policy_path(): + if STANDALONE: + return os.path.join(here(), "..", "apps", "helpers", + "se.leap.bitmask.bundle.policy") + return pkg_resources.resource_filename( 'leap.bitmask.vpn.helpers.linux', 'se.leap.bitmask.bundle.policy') -- cgit v1.2.3