bash: be aware of existing ssh agents

1 files changed, 19 insertions, 7 deletions

diff --git a/.bashrc b/.bashrc
index e51ce04..6f93f5f 100644
--- a/.bashrc
+++ b/.bashrc
@@ -598,11 +598,28 @@ function get_ssh_agent
     done
 
     local agent_out="$HOME/.ssh/agent.out-$(hostname)"
-    source $agent_out &>/dev/null
 
+    # Check if agent is already started. This often happens early in
+    # the startup process for X11 (see /etc/X11/xinit/xinitrc-common).
+    # If the agent was already started then our local state file is
+    # probably out of date with our environment file, update it so that
+    # other sessions in other shells that may not be connected to this
+    # X11 session use the same agent.
+    ssh-add -l &>/dev/null
+    if [[ $? -ne 2 ]]; then
+        echo "SSH_AUTH_SOCK=${SSH_AUTH_SOCK}; export SSH_AUTH_SOCK;" > "$agent_out"
+        echo "SSH_AGENT_PID=${SSH_AGENT_PID}; export SSH_AGENT_PID;" >> "$agent_out"
+        echo "echo Agent pid ${SSH_AGENT_PID};" >> "$agent_out"
+    fi
+
+    source "$agent_out" &>/dev/null
+
+    # If the agent still isn't connected after sourcing our local agent
+    # state file then it probably isn't running at all. Start a new
+    # agent and update the state file.
     ssh-add -l &>/dev/null
     if [[ $? -eq 2 && -n "$start_agent" ]]; then
-        eval $(ssh-agent | tee $agent_out) &>/dev/null
+        eval $(ssh-agent | tee "$agent_out") &>/dev/null
     fi
 
     if [[ -n "$load_keys" ]]; then
@@ -699,8 +716,3 @@ done
 
 [[ -r ~/.homebrew_github_api_token ]] && export HOMEBREW_GITHUB_API_TOKEN=$(cat ~/.homebrew_github_api_token)
 [[ -f ~/.bashrc_local ]] && source ~/.bashrc_local
-
-#
-# FINALIZATION
-#
-get_ssh_agent -s