From 9a71864288e5fb3898b0764db3e547cf7bb7328c Mon Sep 17 00:00:00 2001
From: Chris Fleming <me@chrisfleming.org>
Date: Sat, 21 Apr 2018 21:26:36 +0100
Subject: Fix gpg-agent plugin checks (#6469)

* Always try and start gpg-agent, with --use-standard-socket it will try and use a standard socket directory. It won't start multiple agents if agent is already running. In addition, XDG_RUNTIME_DIR isn't always set

* ssh socket if broken if --daemon is run again, so onky start if we don't have a socket

* Removed unnecessary allocation of GPG_SSH_AUTH_SOCK
---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'plugins/gpg-agent')

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 69e239ccf..6a94f598f 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -1,14 +1,16 @@
-# Enable gpg-agent if it is not running
-GPG_AGENT_SOCKET="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
-if [ ! -S $GPG_AGENT_SOCKET ]; then
-  gpg-agent --daemon >/dev/null 2>&1
-  export GPG_TTY=$(tty)
+# 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`
+
+if [ ! -S ${AGENT_SOCK} ]; then
+  gpg-agent --daemon --use-standard-socket >/dev/null 2>&1
 fi
+export GPG_TTY=$(tty)
 
-# Set SSH to use gpg-agent if it is configured to do so
-GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf"
-if [ -r "$GNUPGCONFIG" ] && grep -q enable-ssh-support "$GNUPGCONFIG"; then
+# Set SSH to use gpg-agent if it's enabled
+if [ -S "${AGENT_SOCK}.ssh" ]; then
+  export SSH_AUTH_SOCK="${AGENT_SOCK}.ssh"
   unset SSH_AGENT_PID
-  export SSH_AUTH_SOCK=$GPG_AGENT_SOCKET
 fi
 
-- 
cgit v1.2.3-70-g09d2


From 8eba19208dfd62a0565e837a715e62d9876480a0 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 27 Apr 2018 17:56:21 +0200
Subject: 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(-)

(limited to 'plugins/gpg-agent')

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 6a94f598f..3e24c2527 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
-
-- 
cgit v1.2.3-70-g09d2


From eb87529b98abf5764c584a663a6665fce35e4fbf Mon Sep 17 00:00:00 2001
From: Stephan Salzmann <kaffdaddy@insomniaonline.de>
Date: Fri, 19 Oct 2018 16:36:51 +0200
Subject: Adding gpg-agent plugin README

---
 plugins/gpg-agent/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 plugins/gpg-agent/README.md

(limited to 'plugins/gpg-agent')

diff --git a/plugins/gpg-agent/README.md b/plugins/gpg-agent/README.md
new file mode 100644
index 000000000..f5fe77102
--- /dev/null
+++ b/plugins/gpg-agent/README.md
@@ -0,0 +1,8 @@
+# gpg-agent
+
+Enable gpg-agent if it is not running.
+
+To use it, add gpg-agent to the plugins array of your zshrc file:
+```
+plugins=(... gpg-agent)
+```
-- 
cgit v1.2.3-70-g09d2


From ca50dfda9f02836910bf5bc956d7d786bc997f92 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Fri, 19 Oct 2018 18:54:26 +0200
Subject: add link to documentation

---
 plugins/gpg-agent/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/gpg-agent')

diff --git a/plugins/gpg-agent/README.md b/plugins/gpg-agent/README.md
index f5fe77102..a9711f923 100644
--- a/plugins/gpg-agent/README.md
+++ b/plugins/gpg-agent/README.md
@@ -1,6 +1,6 @@
 # gpg-agent
 
-Enable gpg-agent if it is not running.
+Enables [GPG's gpg-agent](https://www.gnupg.org/documentation/manuals/gnupg/) if it is not running.
 
 To use it, add gpg-agent to the plugins array of your zshrc file:
 ```
-- 
cgit v1.2.3-70-g09d2