From: James Bunton <jamesbunton@delx.au>
Date: Thu, 8 Feb 2024 02:19:05 +0000 (+1100)
Subject: bashrc: find SSH keyring in more places
X-Git-Url: https://code.delx.au/dotfiles/commitdiff_plain/414654d6b95238081ff81f74e504a76f649a8cba

bashrc: find SSH keyring in more places
---

diff --git a/.bashrc b/.bashrc
index 7a37f49..d75f6ea 100644
--- 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