gnupg: reuse the running agent on X11 startup

3 files changed, 9 insertions, 5 deletions

diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf
index 5a1f457..a6c6605 100644
--- a/gnupg/gpg-agent.conf
+++ b/gnupg/gpg-agent.conf
@@ -2,6 +2,8 @@
 
 # Do not grab the keyboard
 #no-grab
+# Write the environment file
+write-env-file /home/anrxc/.gnupg/gpg-agent-info
 # Cache settings
 max-cache-ttl 7200
 default-cache-ttl 7200
diff --git a/xinitrc b/xinitrc
index d672077..83aff98 100755
--- a/xinitrc
+++ b/xinitrc
@@ -100,7 +100,12 @@ fi
 # {{{ Autostart settings
 #
 # Start the GnuPG agent and enable the OpenSSH agent emulation
-eval "$(/usr/bin/killall gpg-agent; /usr/bin/gpg-agent --enable-ssh-support --daemon)"
+if ( /bin/pidof gpg-agent >/dev/null ); then
+    eval "$(cat $HOME/.gnupg/gpg-agent-info)"
+    eval "$(cut -d= -f 1 < $HOME/.gnupg/gpg-agent-info | xargs echo export)"
+else
+    eval "$(gpg-agent --enable-ssh-support --daemon)"
+fi
 
 # Play a startup sound
 #/usr/bin/ogg123 -q $HOME/.fvwm/sounds/Startup.ogg &
diff --git a/zshrc b/zshrc
index 817d17e..96dadaa 100644
--- a/zshrc
+++ b/zshrc
@@ -160,9 +160,7 @@ function snap () {
     [ $3 ] && format=$3 || format=png
     stamp=`date +%d%m%y-%H%M`
     echo -n "Snapshot in "
-    for (( i = $tmout; i >= 1; i-- )) do
-       echo -n "$i.. "; sleep 1
-    done
+    for (( i = $tmout; i >= 1; i-- )) do; echo -n "$i.. "; sleep 1; done
     import  -window root -quality 100 ~/$1-$stamp.$format
     convert -resize "15%" ~/$1-$stamp.$format ~/$1-$stamp.th.$format
     echo "saved as: ~/$1-$stamp.$format"
@@ -289,7 +287,6 @@ function setprompt () {
             PR_TITLEBAR=$'%{\e]0;%n@%m:%~ | ${COLUMNS}x${LINES} | %y\a%}'
 	    ;;
 	screen*)
-            SSH_AUTH_SOCK=`find /tmp/gpg-* -name S.gpg-agent.ssh`
             PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
 	    ;;
     esac