X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=setup%2Fx2go-hack.el;h=64af9dbe8e3e91e5713096625e17c0aca149324e;hb=a13a166794e1e6f22407e13110fe83b9cb095ab8;hp=56ca33a681a8a2edff28fefe96e2f595f0f34f8a;hpb=844f5833be3c5f0d48e1b3b900c592841f0516d6;p=emacs-init.git

diff --git a/setup/x2go-hack.el b/setup/x2go-hack.el
index 56ca33a..64af9db 100644
--- a/setup/x2go-hack.el
+++ b/setup/x2go-hack.el
@@ -1,8 +1,16 @@
 (defvar ssh-agent-auth-sock-link "~/.ssh/ssh_auth_sock")
 
+(defun g0dil-set-ssh-agent()
+  (message "SSH_AUTH_SOCK set to %s" ssh-agent-auth-sock-link)
+  (setenv "SSH_AUTH_SOCK" (expand-file-name ssh-agent-auth-sock-link)))
+
 (defun g0dil-x2go-fix-ssh-agent ()
   (let ((agent (getenv "SSH_AUTH_SOCK")))
-    (if (string-match "^.*/\.x2go/.*/ssh-agent.PID" agent)
-        (setenv "SSH_AUTH_SOCK" (expand-file-name ssh-agent-auth-sock-link)))))
+    (if (and agent (string-match "^.*/\.x2go/.*/ssh-agent.PID" agent))
+      (g0dil-set-ssh-agent))))
+
+(defun g0dil-fix-ssh-agent ()
+  (if (file-exists-p ssh-agent-auth-sock-link)
+    (g0dil-set-ssh-agent)))
 
-(g0dil-x2go-fix-ssh-agent)
+(g0dil-fix-ssh-agent)