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

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

Browse Source
This commit is contained in:
Chris Fleming 2017-11-28 00:57:30 +00:00
parent 8690d9fd35
commit 8f75f950ef
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,17 @@
# Enable gpg-agent if it is not running- # Enable gpg-agent if it is not running-
# --use-standard-socket will work from version 2 upwards # --use-standard-socket will work from version 2 upwards
# If already running then new agent won't be started.
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 gpg-agent --daemon --use-standard-socket >/dev/null 2>&1
fi
export GPG_TTY=$(tty) export GPG_TTY=$(tty)
# Set SSH to use gpg-agent if it is configured to do so # Set SSH to use gpg-agent if it's enabled
GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf" GPG_SSH_AUTH_SOCK="${AGENT_SOCK}.ssh"
if [ -r "$GNUPGCONFIG" ] && grep -q enable-ssh-support "$GNUPGCONFIG"; then if [ -S ${GPG_SSH_AUTH_SOCK} ]; then
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then export SSH_AUTH_SOCK=$GPG_SSH_AUTH_SOCK
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
unset SSH_AGENT_PID unset SSH_AGENT_PID
fi fi
fi