diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2022-04-02 13:24:35 -0500 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2022-04-02 13:24:35 -0500 |
| commit | 2023d3ab658fe8ed4dd4ca33cd5974ab8f0ad945 (patch) | |
| tree | 99add95300f57806b89bd885a5f5322ce9f9ac1a /plugins/gpg-agent/gpg-agent.plugin.zsh | |
| parent | cae9a2b797649379e865e6bd73bc67e294e4ac77 (diff) | |
| parent | 53863e7b3ff0c2e2816e90dab3d870adebdf49c7 (diff) | |
| download | zsh-2023d3ab658fe8ed4dd4ca33cd5974ab8f0ad945.tar.gz zsh-2023d3ab658fe8ed4dd4ca33cd5974ab8f0ad945.tar.bz2 zsh-2023d3ab658fe8ed4dd4ca33cd5974ab8f0ad945.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'plugins/gpg-agent/gpg-agent.plugin.zsh')
| -rw-r--r-- | plugins/gpg-agent/gpg-agent.plugin.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh index 0adc8de5d..1f4be20b0 100644 --- a/plugins/gpg-agent/gpg-agent.plugin.zsh +++ b/plugins/gpg-agent/gpg-agent.plugin.zsh @@ -9,7 +9,7 @@ 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 +if [[ $(gpgconf --list-options gpg-agent 2>/dev/null | awk -F: '$1=="enable-ssh-support" {print $10}') = 1 ]]; then unset SSH_AGENT_PID if [[ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]]; then export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" |