From 8eba19208dfd62a0565e837a715e62d9876480a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 27 Apr 2018 17:56:21 +0200
Subject: [PATCH] Revert to checking if `enable-ssh-support` is set

Fixes #6772
---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 6a94f598..3e24c252 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -1,16 +1,16 @@
 # Enable gpg-agent if it is not running-
 # --use-standard-socket will work from version 2 upwards
 
-AGENT_SOCK=`gpgconf --list-dirs | grep agent-socket | cut -d : -f 2`
+AGENT_SOCK=$(gpgconf --list-dirs | grep agent-socket | cut -d : -f 2)
 
-if [ ! -S ${AGENT_SOCK} ]; then
-  gpg-agent --daemon --use-standard-socket >/dev/null 2>&1
+if [[ ! -S $AGENT_SOCK ]]; then
+  gpg-agent --daemon --use-standard-socket &>/dev/null
 fi
-export GPG_TTY=$(tty)
+export GPG_TTY=$TTY
 
 # Set SSH to use gpg-agent if it's enabled
-if [ -S "${AGENT_SOCK}.ssh" ]; then
-  export SSH_AUTH_SOCK="${AGENT_SOCK}.ssh"
+GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf"
+if [[ -r $GNUPGCONFIG ]] && command grep -q enable-ssh-support "$GNUPGCONFIG"; then
+  export SSH_AUTH_SOCK="$AGENT_SOCK.ssh"
   unset SSH_AGENT_PID
 fi
-