diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2018-04-27 17:56:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 17:56:21 +0200 |
| commit | 8eba19208dfd62a0565e837a715e62d9876480a0 (patch) | |
| tree | fdb6bd085abe6fcab259efe0b7fc0f4509a6dfdf /plugins/gpg-agent/gpg-agent.plugin.zsh | |
| parent | 9cd3701ac0297f4bdf9673ea0dffa8ffdaea63e8 (diff) | |
| download | zsh-8eba19208dfd62a0565e837a715e62d9876480a0.tar.gz zsh-8eba19208dfd62a0565e837a715e62d9876480a0.tar.bz2 zsh-8eba19208dfd62a0565e837a715e62d9876480a0.zip | |
Revert to checking if `enable-ssh-support` is set
Fixes #6772
Diffstat (limited to 'plugins/gpg-agent/gpg-agent.plugin.zsh')
| -rw-r--r-- | plugins/gpg-agent/gpg-agent.plugin.zsh | 14 |
1 files changed, 7 insertions, 7 deletions
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 - |