bashrc: find SSH keyring in more places

diff --git a/.bashrc b/.bashrc
index 7a37f4925a240c1b46e13a540a7301d64d4d3fd2..d75f6eaf314cb07b1c1eb8d2807b8b1b03a520bb 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -22,12 +22,13 @@ eval "$(cat 2> /dev/null /etc/default/locale /etc/locale.conf ~/.config/environm
 
 # Pick up SSH agent socket
 if [ -z "$SSH_AUTH_SOCK" ]; then
-    if [ -r ~/.ssh-agent.env ]; then
-        source ~/.ssh-agent.env
-    else
-        SSH_AUTH_SOCK="/run/user/$(id -u)/keyring/ssh"
-        export SSH_AUTH_SOCK
-    fi
+    for p in keyring/ssh openssh_agent; do
+        SSH_AUTH_SOCK="/run/user/$(id -u)/$p"
+        if [ -S "$SSH_AUTH_SOCK" ]; then
+            export SSH_AUTH_SOCK
+            break
+        fi
+    done
 fi
 
 # Look for XDG_RUNTIME_DIR