Prefer pinentry-mac on Darwin

gpgconf isn't very reliable or useful.
gopasspw · Dec 18, 2021 · 6c52bbc · 6c52bbc
1 parent f73e4f2
commit 6c52bbc
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/pinentry_darwin.go b/pinentry_darwin.go
@@ -1,11 +1,20 @@
+//go:build darwin
 // +build darwin
 
 package pinentry
 
-import "github.com/gopasspw/pinentry/gpgconf"
+import (
+	"os/exec"
+
+	"github.com/gopasspw/pinentry/gpgconf"
+)
 
 // GetBinary always returns pinentry-mac
 func GetBinary() string {
+	// check, whether the returned path acutally exists
+	if _, err := exec.LookPath("pinentry-mac"); err == nil {
+		return "pinentry-mac"
+	}
 	if p, err := gpgconf.Path("pinentry"); err == nil && p != "" {
 		return p
 	}