gnupg: use pinentry wrapper

diff --git a/Makefile b/Makefile
index 78b93d5280209e55b48729caa89d1a176cf7c740..4bbae54625602c3b2fcfe77393121aa3c009cd35 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,7 @@ gnupg: systemd
        chmod 700 $(XDG_CONFIG_HOME)/$@
        systemctl --user enable gpg-agent.socket gpg-agent-extra.socket gpg-agent-browser.socket dirmngr.socket
        systemctl --user start gpg-agent.socket gpg-agent-extra.socket gpg-agent-browser.socket dirmngr.socket
        chmod 700 $(XDG_CONFIG_HOME)/$@
        systemctl --user enable gpg-agent.socket gpg-agent-extra.socket gpg-agent-browser.socket dirmngr.socket
        systemctl --user start gpg-agent.socket gpg-agent-extra.socket gpg-agent-browser.socket dirmngr.socket

+       sudo ln -sfT $(APATH)/bin/pinentry /usr/local/bin/pinentry

 .PHONY: gnupg
 
 kitty:
 .PHONY: gnupg
 
 kitty:

diff --git a/bin/pinentry b/bin/pinentry
new file mode 100755 (executable)
index 0000000..1560bc7
--- /dev/null
+++ b/bin/pinentry
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+case "$PINENTRY_USER_DATA" in
+    curses) exec /usr/bin/pinentry-curses "$@" ;;
+    none)   exit 1;; # no password
+    *)      exec /usr/bin/pinentry-qt "$@" ;;
+esac

diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf
index eec04db3fe1b0ddbc9cb329da430bd2fa8cbdfe2..37bd324fe5414b93406b703118f9488fe596657e 100644 (file)
--- a/gnupg/gpg-agent.conf
+++ b/gnupg/gpg-agent.conf
@@ -1,4 +1,4 @@
-pinentry-program /usr/bin/pinentry-qt
+pinentry-program /usr/local/bin/pinentry

 keep-display
 default-cache-ttl 600
 max-cache-ttl 7200
 keep-display
 default-cache-ttl 600
 max-cache-ttl 7200