diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2016-10-21 17:00:22 -0400 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2016-10-21 17:17:36 -0400 |
| commit | 478132e3e29eabc6b052df7f06cd1ba1a558ee00 (patch) | |
| tree | 6f6fb3be012cb2b9acb94011d57144cd8b10251f | |
| parent | 5cb173a9939f051fce06bfe540a87881bde9680f (diff) | |
[feat] add path for windows bundle
| -rw-r--r-- | src/leap/bitmask/util.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/leap/bitmask/util.py b/src/leap/bitmask/util.py index 1dd62af5..7195b180 100644 --- a/src/leap/bitmask/util.py +++ b/src/leap/bitmask/util.py @@ -57,10 +57,15 @@ def get_gpg_bin_path(): gpgbin = None if STANDALONE: - gpgbin = os.path.join( - get_path_prefix(), "..", "apps", "mail", "gpg") if platform.system() == "Windows": - gpgbin += ".exe" + gpgbin = os.path.abspath( + os.path.join(here(), "apps", "mail", "gpg.exe")) + elif platform.system() == "Darwin": + gpgbin = os.path.abspath( + os.path.join(here(), "apps", "mail", "gpg")) + else: + gpgbin = os.path.join( + get_path_prefix(), "..", "apps", "mail", "gpg") else: try: gpgbin_options = which("gpg", path_extension='/usr/bin/') @@ -77,9 +82,6 @@ def get_gpg_bin_path(): break except IndexError as e: logger.debug("couldn't find the gpg binary!: %s" % (e,)) - if platform.system() == "Darwin": - gpgbin = os.path.abspath( - os.path.join(here(), "apps", "mail", "gpg")) if gpgbin is not None: return gpgbin |