Merge branch 'main' of github.com:gopasspw/pinentry

* 'main' of github.com:gopasspw/pinentry: Prefer pinentry-mac on Darwin Revert "change module github url" change module github url partly fixes #1. Check path of pinentry.
gopasspw · Jan 10, 2022 · 9a3d859 · 9a3d859
2 parents f7bb423 + 6c52bbc
commit 9a3d859
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
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
 	}

diff --git a/pinentry_others.go b/pinentry_others.go
@@ -2,12 +2,18 @@
 
 package pinentry
 
-import "github.com/gopasspw/pinentry/gpgconf"
+import (
+	"github.com/gopasspw/pinentry/gpgconf"
+	"os/exec"
+)
 
 // GetBinary returns the binary name
 func GetBinary() string {
 	if p, err := gpgconf.Path("pinentry"); err == nil && p != "" {
-		return p
+		// check, whether the returned path acutally exists
+		if _, err := exec.LookPath(p); err == nil {
+			return p
+		}
 	}
 	return "pinentry"
 }