better mac gpg handling and defaulting to gpg2

2 files changed, 4 insertions, 1 deletions

diff --git a/mainwindow.cpp b/mainwindow.cpp
index bd3ad081..b1536975 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -155,7 +155,7 @@ void MainWindow::checkConfig() {
 
     gpgExecutable = settings.value("gpgExecutable").toString();
     if (gpgExecutable == "") {
-        gpgExecutable = Util::findBinaryInPath("gpg");
+        gpgExecutable = Util::findBinaryInPath("gpg2");
     }
     gpgHome = settings.value("gpgHome").toString();
 
diff --git a/util.cpp b/util.cpp
index a2ddac26..42da20dc 100644
--- a/util.cpp
+++ b/util.cpp
@@ -12,6 +12,9 @@ void Util::initialiseEnvironment()
 {
     if (!_envInitialised) {
         _env = QProcessEnvironment::systemEnvironment();
+#ifdef __APPLE__
+        _env.insert("PATH", _env.value("PATH") + ":/usr/local/MacGPG2/bin");
+#endif
         _envInitialised = true;
     }
 }