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

Merge 61497a3dfd into 9cd3701ac0

Browse source
This commit is contained in:
Chris Fleming 2018-04-27 15:02:54 +00:00 • committed by GitHub
commit 9cae425638
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,16 +1,14 @@
# 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"
# Set SSH to use gpg-agent if it's enabled, and we're not using the ssh-agent plugin
if [[ ${+plugins[(r)ssh-agent} -ne 0 && -S "$AGENT_SOCK.ssh" ]]; then
export SSH_AUTH_SOCK="$AGENT_SOCK.ssh"
unset SSH_AGENT_PID
fi