From 000e1664375362657465800f5c943c4e91f97c37 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Tue, 16 Apr 2019 17:17:47 -0700 Subject: [PATCH] use gpg-connect-agent --- .zsh/zshrc/64_ssh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.zsh/zshrc/64_ssh b/.zsh/zshrc/64_ssh index 449d11b..3e5d6f8 100644 --- a/.zsh/zshrc/64_ssh +++ b/.zsh/zshrc/64_ssh @@ -1,8 +1,11 @@ # -*- mode: sh -*- -# -*- mode: sh -*- # set up ssh-agent -if which ssh-agent >/dev/null && [ -d ~/.ssh ] && \ +if which gpg-connect-agent >/dev/null && [ -n "$GPG_AGENT_INFO" ]; then + SSH_AUTH_SOCK=$(gpg-connect-agent -q 'getinfo ssh_socket_name' '/bye'| + awk -F'D ' '/.ssh$/{print $2}') + export SSH_AUTH_SOCK; +elif which ssh-agent >/dev/null && [ -d ~/.ssh ] && \ [ -z "$SSH_CONNECTION" ] && [ -z "$SSH_CLIENT" ]; then if [ -e ~/.ssh/ssh_agent_info ] && \ [ -n "$(awk -F '[=;]' '/^SSH_AGENT_PID/{print $2}' ~/.ssh/ssh_agent_info)" ] && \ -- 2.39.5