diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2017-11-12 19:36:24 -0700 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2017-11-12 19:36:24 -0700 |
| commit | 5e1ad5efbf59a40ef6dc6d404c6f403dff8ed436 (patch) | |
| tree | 2c9ab05f372ad5da84662e18a4d7e258b75d3b17 /plugins/gpg-agent | |
| parent | 6bcf7764f8d8094695c7c04bb9532a0ede40ab37 (diff) | |
| parent | 41eedd37005f6b3668fcebe2a5f5a26324753519 (diff) | |
| download | zsh-5e1ad5efbf59a40ef6dc6d404c6f403dff8ed436.tar.gz zsh-5e1ad5efbf59a40ef6dc6d404c6f403dff8ed436.tar.bz2 zsh-5e1ad5efbf59a40ef6dc6d404c6f403dff8ed436.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/gpg-agent')
| -rw-r--r-- | plugins/gpg-agent/gpg-agent.plugin.zsh | 49 |
1 files changed, 11 insertions, 38 deletions
diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh index 3e6a34f42..69e239ccf 100644 --- a/plugins/gpg-agent/gpg-agent.plugin.zsh +++ b/plugins/gpg-agent/gpg-agent.plugin.zsh @@ -1,41 +1,14 @@ -local GPG_ENV=$HOME/.gnupg/gpg-agent.env - -function start_agent_nossh { - eval $(/usr/bin/env gpg-agent --quiet --daemon --write-env-file ${GPG_ENV} 2> /dev/null) - chmod 600 ${GPG_ENV} - export GPG_AGENT_INFO -} - -function start_agent_withssh { - eval $(/usr/bin/env gpg-agent --quiet --daemon --enable-ssh-support --write-env-file ${GPG_ENV} 2> /dev/null) - chmod 600 ${GPG_ENV} - export GPG_AGENT_INFO - export SSH_AUTH_SOCK - export SSH_AGENT_PID -} - -# check if another agent is running -if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then - # source settings of old agent, if applicable - if [ -f "${GPG_ENV}" ]; then - . ${GPG_ENV} > /dev/null - export GPG_AGENT_INFO - export SSH_AUTH_SOCK - export SSH_AGENT_PID - fi +# Enable gpg-agent if it is not running +GPG_AGENT_SOCKET="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh" +if [ ! -S $GPG_AGENT_SOCKET ]; then + gpg-agent --daemon >/dev/null 2>&1 + export GPG_TTY=$(tty) +fi - # check again if another agent is running using the newly sourced settings - if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then - # check for existing ssh-agent - if ssh-add -l > /dev/null 2> /dev/null; then - # ssh-agent running, start gpg-agent without ssh support - start_agent_nossh; - else - # otherwise start gpg-agent with ssh support - start_agent_withssh; - fi - fi +# Set SSH to use gpg-agent if it is configured to do so +GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf" +if [ -r "$GNUPGCONFIG" ] && grep -q enable-ssh-support "$GNUPGCONFIG"; then + unset SSH_AGENT_PID + export SSH_AUTH_SOCK=$GPG_AGENT_SOCKET fi -GPG_TTY=$(tty) -export GPG_TTY |