summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-08-05 18:57:36 -0700
committerIvan Alejandro <ivanalejandro0@gmail.com>2015-08-07 19:02:24 -0300
commitf5e150a4fe87b60316d278de6b4ead08357f2dba (patch)
tree2e97733a64703fb5c63f3b6732eef900d3c5a384
parent657005c72abdd478d1f4809e9984d401cbbbb845 (diff)
[feat] add path to gpg binary in the bundle
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index 1825d317..57ae3849 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -37,7 +37,8 @@ from leap.bitmask.services.abstractbootstrapper import AbstractBootstrapper
from leap.bitmask.services.soledad.soledadconfig import SoledadConfig
from leap.bitmask.util import first, is_file, is_empty_file, make_address
from leap.bitmask.util import get_path_prefix
-from leap.bitmask.platform_init import IS_WIN
+from leap.bitmask.util import here
+from leap.bitmask.platform_init import IS_WIN, IS_MAC
from leap.common.check import leap_assert, leap_assert_type, leap_check
from leap.common.files import which
from leap.keymanager import KeyManager, openpgp
@@ -439,6 +440,9 @@ class SoledadBootstrapper(AbstractBootstrapper):
except IndexError as e:
logger.debug("Couldn't find the gpg binary!")
logger.exception(e)
+ if IS_MAC:
+ gpgbin = os.path.abspath(
+ os.path.join(here(), "apps", "mail", "gpg"))
leap_check(gpgbin is not None, "Could not find gpg binary")
return gpgbin