Customization/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-13 01:10:09 +00:00
Code Releases Activity

fix(gpg-agent): correctly overwrite $SSH_AUTH_SOCK and other improvements (#7059)

Browse source
This commit is contained in:
Dapeng Gao 2021-10-05 19:54:53 +08:00 committed by GitHub
parent 49bc55f966
commit e5b9b80008
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/gpg-agent/README.md
View file

@ -2,7 +2,7 @@
Enables [GPG's gpg-agent](https://www.gnupg.org/documentation/manuals/gnupg/) if it is not running. Enables [GPG's gpg-agent](https://www.gnupg.org/documentation/manuals/gnupg/) if it is not running.
To use it, add gpg-agent to the plugins array of your zshrc file: To use it, add `gpg-agent` to the plugins array of your zshrc file:
```zsh ```zsh
plugins=(... gpg-agent) plugins=(... gpg-agent)

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

@ -1,16 +1,17 @@
# 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)
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 # Fix for passphrase prompt on the correct tty
GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf" # See https://www.gnupg.org/documentation/manuals/gnupg/Agent-Options.html#option-_002d_002denable_002dssh_002dsupport
if [[ -r $GNUPGCONFIG ]] && command grep -q enable-ssh-support "$GNUPGCONFIG"; then function _gpg-agent_update-tty_preexec {
export SSH_AUTH_SOCK="$AGENT_SOCK.ssh" gpg-connect-agent updatestartuptty /bye &>/dev/null
}
autoload -U add-zsh-hook
add-zsh-hook preexec _gpg-agent_update-tty_preexec
# If enable-ssh-support is set, fix ssh agent integration
if [[ $(gpgconf --list-options gpg-agent | awk -F: '$1=="enable-ssh-support" {print $10}') = 1 ]]; then
unset SSH_AGENT_PID unset SSH_AGENT_PID
if [[ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]]; then
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
fi
fi fi