diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2017-05-01 17:10:39 +0200 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2017-05-03 11:06:52 +0200 |
| commit | 0cc95f1df0641606f0173226e6f1b9f44112f962 (patch) | |
| tree | 45bb214c51b84a7f1e0c307571f93cb3d10f5416 /src/leap/bitmask/vpn/_config.py | |
| parent | a295b63d59275ccef839d349d6d92a2cb8ee33b7 (diff) | |
[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
Diffstat (limited to 'src/leap/bitmask/vpn/_config.py')
| -rw-r--r-- | src/leap/bitmask/vpn/_config.py | 12 |
1 files changed, 11 insertions, 1 deletions
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') |