Add ugly ssh agent check

1 files changed, 16 insertions, 4 deletions

diff --git a/.bashrc b/.bashrc
index 15c54fd..9908503 100644
--- a/.bashrc
+++ b/.bashrc
@@ -577,6 +577,17 @@ function tm
 }
 func_export tm
 
+# An ugly check to test for ssh agent liveness. Normally ssh-add should return
+# 2 to indicate that it can't talk to the agent but in older versions of Ubutu
+# the command returns 1 and some text on stderr about not being able to connect
+# to the agent (even though the man page says this should not happen). Thus
+# this ugly hack of a check function.
+function _ssh_agent_is_running
+{
+        output=$(ssh-add 2>&1)
+        [[ $? -ne 2 && ! "$output" =~ "communication with agent failed" ]]
+}
+
 # Start or resume an ssh agent and add keys if needed
 # The -d argument will add keys if needed
 function get_ssh_agent
@@ -616,8 +627,7 @@ function get_ssh_agent
     # 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
+        if _ssh_agent_is_running; 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"
@@ -628,8 +638,7 @@ function get_ssh_agent
     # 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
+        if ! _ssh_agent_is_running && [[ -n "$start_agent" ]]; then
         eval $(ssh-agent | tee "$agent_out") &>/dev/null
     fi
 
@@ -727,3 +736,6 @@ done
 
 [[ -r ~/.homebrew_github_api_token ]] && export HOMEBREW_GITHUB_API_TOKEN=$(cat ~/.homebrew_github_api_token)
 [[ -f ~/.bashrc_local ]] && source ~/.bashrc_local
+
+# Make sure we can talk to the SSH agent if one is running
+get_ssh_agent