linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-06-05 05:03:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't set SSH_AUTH_SOCK if the ssh-agent plugin is enabled

Browse source
This commit is contained in:
Chris Fleming 2018-04-26 17:20:26 +01:00
commit 39c230e9d1
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/gpg-agent/gpg-agent.plugin.zsh
View file

@ -1,7 +1,5 @@
# 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
typeset _gpg_ssh_socket
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
@ -9,12 +7,10 @@ if [ ! -S ${AGENT_SOCK} ]; then
fi fi
export GPG_TTY=$(tty) export GPG_TTY=$(tty)
# Set SSH to use gpg-agent if it's enabled, and we've set config # Set SSH to use gpg-agent if it's enabled, and we're not using the ssh-agent plugin
zstyle -b :omz:plugins:gpg-agent ssh-socket _gpg_ssh_socket echo "$plugins" | fgrep -q "ssh-agent"
if [[ $? -eq 1 && -S "${AGENT_SOCK}.ssh" ]]; then
if [[ $_gpg_ssh_socket == "yes" && -S "${AGENT_SOCK}.ssh" ]]; then
export SSH_AUTH_SOCK="${AGENT_SOCK}.ssh" export SSH_AUTH_SOCK="${AGENT_SOCK}.ssh"
unset SSH_AGENT_PID unset SSH_AGENT_PID
fi fi
unset _gpg_ssh_socket