use gpg-connect-agent

[zsh.git] / .zsh / zshrc / 64_ssh

diff --git a/.zsh/zshrc/64_ssh b/.zsh/zshrc/64_ssh
index 449d11b9f25a9a9bea40062e5f33d4f60e7c97af..3e5d6f8aa3f49e88682c20aa40eaf7ecf1fe9c9a 100644 (file)
--- 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)" ] && \