From 2463578b14cd65edc638c857cdbb264e675a2f67 Mon Sep 17 00:00:00 2001 From: David Beltra Date: Tue, 21 Jul 2020 16:05:55 +0200 Subject: [PATCH] try agentpath before path --- platform_Windows.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/platform_Windows.py b/platform_Windows.py index a5dc130..49a788a 100644 --- a/platform_Windows.py +++ b/platform_Windows.py @@ -1,10 +1,16 @@ # coding=UTF-8 import os +from common import which, GnuPGNotFound + def gpg_executable(thunderbird_base): - for p in os.environ["PATH"].split(os.pathsep): - if 'Gpg4win' in p: - return os.path.join(p, 'gpg.exe') + enigmail_gpg = enigmail_agentPath(thunderbird_base) + gpg = enigmail_gpg if enigmail_gpg else which('gpg.exe') + if not gpg: + raise GnuPGNotFound() + else: + return gpg + thunderbird_base = os.path.join(os.environ['APPDATA'], 'Thunderbird')