ylib/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-25 17:57:34 +08:00
Code Projects Releases Wiki Activity
3a6fa9149b
ohmyzsh/plugins/gpg-agent/gpg-agent.plugin.zsh

17 lines
532 B
Bash
Raw Normal View History

Fix gpg-agent plugin checks (#6469) * Always try and start gpg-agent, with --use-standard-socket it will try and use a standard socket directory. It won't start multiple agents if agent is already running. In addition, XDG_RUNTIME_DIR isn't always set * ssh socket if broken if --daemon is run again, so onky start if we don't have a socket * Removed unnecessary allocation of GPG_SSH_AUTH_SOCK
2018-04-22 04:26:36 +08:00
# Enable gpg-agent if it is not running-
# --use-standard-socket will work from version 2 upwards
Revert to checking if `enable-ssh-support` is set Fixes #6772
2018-04-27 23:56:21 +08:00
AGENT_SOCK=$(gpgconf --list-dirs | grep agent-socket | cut -d : -f 2)
Fix gpg-agent plugin checks (#6469) * Always try and start gpg-agent, with --use-standard-socket it will try and use a standard socket directory. It won't start multiple agents if agent is already running. In addition, XDG_RUNTIME_DIR isn't always set * ssh socket if broken if --daemon is run again, so onky start if we don't have a socket * Removed unnecessary allocation of GPG_SSH_AUTH_SOCK
2018-04-22 04:26:36 +08:00
Revert to checking if `enable-ssh-support` is set Fixes #6772
2018-04-27 23:56:21 +08:00
if [[ ! -S $AGENT_SOCK ]]; then
gpg-agent --daemon --use-standard-socket &>/dev/null
Fixed the gpg-agent plugin for new gpg versions (#6140) The gpg-agent plugin did not work for gpg versions above or equal to 2.1 because of the `--write-env-file` option deprecation. This new version works fine and also enables the ssh-agent support only if it is enabled in the gpg-agent config file.
2017-11-08 00:04:38 +08:00
fi
Revert to checking if `enable-ssh-support` is set Fixes #6772
2018-04-27 23:56:21 +08:00
export GPG_TTY=$TTY
Added gpg-agent plugin Based on ssh-agent plugin.
2010-10-15 22:50:39 +08:00
Fix gpg-agent plugin checks (#6469) * Always try and start gpg-agent, with --use-standard-socket it will try and use a standard socket directory. It won't start multiple agents if agent is already running. In addition, XDG_RUNTIME_DIR isn't always set * ssh socket if broken if --daemon is run again, so onky start if we don't have a socket * Removed unnecessary allocation of GPG_SSH_AUTH_SOCK
2018-04-22 04:26:36 +08:00
# Set SSH to use gpg-agent if it's enabled
Revert to checking if `enable-ssh-support` is set Fixes #6772
2018-04-27 23:56:21 +08:00
GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf"
if [[ -r $GNUPGCONFIG ]] && command grep -q enable-ssh-support "$GNUPGCONFIG"; then
export SSH_AUTH_SOCK="$AGENT_SOCK.ssh"
Fixed the gpg-agent plugin for new gpg versions (#6140) The gpg-agent plugin did not work for gpg versions above or equal to 2.1 because of the `--write-env-file` option deprecation. This new version works fine and also enables the ssh-agent support only if it is enabled in the gpg-agent config file.
2017-11-08 00:04:38 +08:00
unset SSH_AGENT_PID
Disable ssh-agent support if another ssh-agent is already running.
2013-02-21 09:46:20 +08:00
fi
Copy Permalink