kevin/ohmyzsh
1
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-15 01:48:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert to checking if enable-ssh-support is set

Browse Source 
Fixes #6772
This commit is contained in:
Marc Cornellà 2018-04-27 17:56:21 +02:00 committed by GitHub
parent 9cd3701ac0
commit 8eba19208d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,16 @@
# 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
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 if [[ ! -S $AGENT_SOCK ]]; then
gpg-agent --daemon --use-standard-socket >/dev/null 2>&1 gpg-agent --daemon --use-standard-socket &>/dev/null
fi fi
export GPG_TTY=$(tty) export GPG_TTY=$TTY
# Set SSH to use gpg-agent if it's enabled # Set SSH to use gpg-agent if it's enabled
if [ -S "${AGENT_SOCK}.ssh" ]; then GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf"
export SSH_AUTH_SOCK="${AGENT_SOCK}.ssh" if [[ -r $GNUPGCONFIG ]] && command grep -q enable-ssh-support "$GNUPGCONFIG"; then
export SSH_AUTH_SOCK="$AGENT_SOCK.ssh"
unset SSH_AGENT_PID unset SSH_AGENT_PID
fi fi