diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2018-04-25 15:36:48 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2018-04-25 15:36:48 -0600 |
| commit | 1481f7aa67df42bdf45953231637194ac200d240 (patch) | |
| tree | 7d41eb6b369e3ab0f25753623c966b69340e54cf /plugins/gpg-agent | |
| parent | b7b623d6de696b81d213ec666d072851561d5c06 (diff) | |
| parent | 9cd3701ac0297f4bdf9673ea0dffa8ffdaea63e8 (diff) | |
| download | zsh-1481f7aa67df42bdf45953231637194ac200d240.tar.gz zsh-1481f7aa67df42bdf45953231637194ac200d240.tar.bz2 zsh-1481f7aa67df42bdf45953231637194ac200d240.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/gpg-agent')
| -rw-r--r-- | plugins/gpg-agent/gpg-agent.plugin.zsh | 20 |
1 files changed, 11 insertions, 9 deletions
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 |