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

Revert "Fix gpg-agent plugin checks (#6469)"

Browse source 
This reverts commit 8a71864288e5fb3898b0764db3e547cf7bb7328c.
This commit is contained in:
Tom Whitwell 2018-04-26 13:00:17 +01:00
commit bdceb2a2b8
No known key found for this signature in database
GPG key ID: 0DE95AC55A20ADCB
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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