summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/util.py
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-10-21 17:00:22 -0400
committerKali Kaneko (leap communications) <kali@leap.se>2016-10-21 17:17:36 -0400
commit478132e3e29eabc6b052df7f06cd1ba1a558ee00 (patch)
tree6f6fb3be012cb2b9acb94011d57144cd8b10251f /src/leap/bitmask/util.py
parent5cb173a9939f051fce06bfe540a87881bde9680f (diff)
[feat] add path for windows bundle
Diffstat (limited to 'src/leap/bitmask/util.py')
-rw-r--r--src/leap/bitmask/util.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/leap/bitmask/util.py b/src/leap/bitmask/util.py
index 1dd62af..7195b18 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