From 734e8fdab023199981b990094c1f2cedc7b28299 Mon Sep 17 00:00:00 2001
From: Aaron LI <aly@aaronly.me>
Date: Tue, 20 Feb 2018 22:45:56 +0800
Subject: zsh/gpg: add back the preexec hook to update tty for ssh agent
 support

---
 _zsh/80-gpg.zsh | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to '_zsh/80-gpg.zsh')

diff --git a/_zsh/80-gpg.zsh b/_zsh/80-gpg.zsh
index d9d5dbb..2cbb70c 100644
--- a/_zsh/80-gpg.zsh
+++ b/_zsh/80-gpg.zsh
@@ -26,6 +26,31 @@ if [ -n "${SSH_CONNECTION}" ] ;then
     export PINENTRY_USER_DATA="USE_CURSES=1"
 fi
 
+# Let pinentry know which console to display in for `ssh-agent'.
+#
+# Since the 'ssh-agent' protocol does not contain a mechanism for telling
+# the agent on which terminal/display it is running, gpg-agent's
+# ssh-support can just use the TTY or X display when `gpg-agent' has been
+# started, which may be before the X session startup.  Therefore, when the
+# switched to the X session, or login remotely through SSH, the `pinentry'
+# will get popped up on whatever display the `gpg-agent' has been started
+# or may just fail.  In this case, a manual update is necessary.
+#
+# This will set startup TTY and X11 DISPLAY variables to the values of
+# this session.
+#
+# Credits:
+# * GnuPG: Commonly Seen Problems
+#   https://www.gnupg.org/documentation/manuals/gnupg/Common-Problems.html
+# * `gpg-agent(1)': option `--enable-ssh-support'
+# * http://blog.mrloop.com/workflow/2017/02/09/pin-entry.html
+#
+update-gpg-tty() {
+    gpg-connect-agent updatestartuptty /bye >/dev/null 2>&1 || true
+}
+autoload -U add-zsh-hook
+add-zsh-hook preexec update-gpg-tty
+
 # Delete all identities from the `gpg-agent', which is similar to
 # `ssh-add -D`.
 # Credit: http://blog.mrloop.com/workflow/2017/02/09/pin-entry.html
-- 
cgit v1.2.2