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
Diff
1diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
2index 69e239ccf6214e3a58baf0904a4076e7519052b0..6a94f598f0097c140efdc45808664826043fb27b 100644
3--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
4+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
5@@ -1,14 +1,16 @@
6-# Enable gpg-agent if it is not running
7-GPG_AGENT_SOCKET="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
8-if [ ! -S $GPG_AGENT_SOCKET ]; then
9- gpg-agent --daemon >/dev/null 2>&1
10- export GPG_TTY=$(tty)
11+# Enable gpg-agent if it is not running-
12+# --use-standard-socket will work from version 2 upwards
13+
14+AGENT_SOCK=`gpgconf --list-dirs | grep agent-socket | cut -d : -f 2`
15+
16+if [ ! -S ${AGENT_SOCK} ]; then
17+ gpg-agent --daemon --use-standard-socket >/dev/null 2>&1
18 fi
19+export GPG_TTY=$(tty)
2021-# Set SSH to use gpg-agent if it is configured to do so
22-GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf"
23-if [ -r "$GNUPGCONFIG" ] && grep -q enable-ssh-support "$GNUPGCONFIG"; then
24+# Set SSH to use gpg-agent if it's enabled
25+if [ -S "${AGENT_SOCK}.ssh" ]; then
26+ export SSH_AUTH_SOCK="${AGENT_SOCK}.ssh"
27 unset SSH_AGENT_PID
28- export SSH_AUTH_SOCK=$GPG_AGENT_SOCKET
29 fi
30