From 8d4abc0d31606fac01e57976e35b159856656537 Mon Sep 17 00:00:00 2001
From: Darren Austin <darren@afterdark.org.uk>
Date: Fri, 7 Oct 2016 19:01:04 +0100
Subject: [PATCH] Refactor ssh-agent output.

---
 .bash_profile | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.bash_profile b/.bash_profile
index 73e07b3..a7c6dcf 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -20,11 +20,9 @@ export VISUAL="$EDITOR"
 # Platform specific set up.
 _PLATFORM="$(uname -s)"
 if [ "$_PLATFORM" = "Linux" ]; then
-  # Environment,
   export I_WANT_A_BROKEN_PS=1
   hash dircolors >/dev/null 2>&1 && eval "$(dircolors -b ~/.dir_colors)"
 elif [ "$_PLATFORM" = "Darwin" ]; then
-  # Environment.
   export LSCOLORS="ExGxdxdxCxDxDxbcacbeae"
   export MANPATH="/opt/local/share/man:$MANPATH"
   export PATH="/opt/local/bin:/opt/local/sbin:$PATH"
@@ -38,35 +36,35 @@ hash ssh-add ssh-agent >/dev/null 2>&1 && {
   if [ ! -z "$SSH_AUTH_SOCK" ]; then
     ssh-add -l >/dev/null 2>&1
     if (( $? < 2 )); then
+      echo "Connected to ssh-agent."
       echo
-      echo "Connected to forwarded ssh-agent ($SSH_AGENT_PID)."
       alias ssh='ssh-add -l >/dev/null 2>&1 && unalias ssh || { ssh-add && unalias ssh; }; ssh'
     else
-      echo
       echo "Problem connecting to forwarded ssh-agent!"
+      echo
     fi
   else
     . ~/.ssh/agent 2>/dev/null
     ssh-add -l >/dev/null 2>&1
     if (( $? < 2 )); then
+      echo "Connected to ssh-agent."
       echo
-      echo "Connected to local ssh-agent at ($SSH_AGENT_PID)."
       alias ssh='ssh-add -l >/dev/null 2>&1 && unalias ssh || { ssh-add && unalias ssh; }; ssh'
     else
       if ssh-agent -s | sed -e '/^echo/ d' >~/.ssh/agent; then
         . ~/.ssh/agent
         ssh-add -l >/dev/null 2>&1
         if (( $? < 2 )); then
+          echo "Started new ssh-agent."
           echo
-          echo "Started new local ssh-agent at PID $SSH_AGENT_PID."
           alias ssh='ssh-add -l >/dev/null 2>&1 && unalias ssh || { ssh-add && unalias ssh; }; ssh'
         else
-          echo
           echo "Problem connecting to local ssh-agent!"
+          echo
         fi
       else
-        echo
         echo "Failed to start local ssh-agent!"
+        echo
       fi
     fi
   fi