adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed the gpg-agent plugin for new gpg versions (#6140)

Browse Source 
The gpg-agent plugin did not work for gpg versions above or equal to
2.1 because of the `--write-env-file` option deprecation. This new version
works fine and also enables the ssh-agent support only if it is enabled in the
gpg-agent config file.
This commit is contained in:
Paweł Czochański 2017-11-07 17:04:38 +01:00 committed by Robby Russell
parent 9d6b6c5ce1
commit c2fb24a792
1 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
plugins/gpg-agent/gpg-agent.plugin.zsh
View File

@ -1,41 +1,14 @@
local GPG_ENV=$HOME/.gnupg/gpg-agent.env # Enable gpg-agent if it is not running
GPG_AGENT_SOCKET="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
function start_agent_nossh { if [ ! -S $GPG_AGENT_SOCKET ]; then
eval $(/usr/bin/env gpg-agent --quiet --daemon --write-env-file ${GPG_ENV} 2> /dev/null) gpg-agent --daemon >/dev/null 2>&1
chmod 600 ${GPG_ENV} export GPG_TTY=$(tty)
export GPG_AGENT_INFO fi
}
# Set SSH to use gpg-agent if it is configured to do so
function start_agent_withssh { GNUPGCONFIG=${GNUPGHOME:-"$HOME/.gnupg/gpg-agent.conf"}
eval $(/usr/bin/env gpg-agent --quiet --daemon --enable-ssh-support --write-env-file ${GPG_ENV} 2> /dev/null) if [ -r "$GNUPGCONFIG" ] && grep -q enable-ssh-support "$GNUPGCONFIG"; then
chmod 600 ${GPG_ENV} unset SSH_AGENT_PID
export GPG_AGENT_INFO export SSH_AUTH_SOCK=$GPG_AGENT_SOCKET
export SSH_AUTH_SOCK
export SSH_AGENT_PID
}
# check if another agent is running
if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
# source settings of old agent, if applicable
if [ -f "${GPG_ENV}" ]; then
. ${GPG_ENV} > /dev/null
export GPG_AGENT_INFO
export SSH_AUTH_SOCK
export SSH_AGENT_PID
fi
# check again if another agent is running using the newly sourced settings
if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
# check for existing ssh-agent
if ssh-add -l > /dev/null 2> /dev/null; then
# ssh-agent running, start gpg-agent without ssh support
start_agent_nossh;
else
# otherwise start gpg-agent with ssh support
start_agent_withssh;
fi
fi
fi fi
GPG_TTY=$(tty)
export GPG_TTY