From 341fe08f93c5738c3fcc012bfe110def818028a6 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 27 Oct 2014 01:19:19 -0700
Subject: [PATCH] emacs.d bump.

---
 dotfiles/emacs.d                  |  2 +-
 dotfiles/lib/shellrc.sh           |  2 +-
 dotfiles/lib/shellrc/aliases.sh   |  1 +
 dotfiles/lib/shellrc/ssh_agent.sh | 83 +++++++++++++++++++++++++++++++
 4 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 dotfiles/lib/shellrc/ssh_agent.sh

diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index e6e801fb..28d54186 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit e6e801fba96f0c355418542e1fbdc0de41135d96
+Subproject commit 28d5418644923134432ec8cbf943c12aeae341e7
diff --git a/dotfiles/lib/shellrc.sh b/dotfiles/lib/shellrc.sh
index 0e29a808..71b10cfd 100644
--- a/dotfiles/lib/shellrc.sh
+++ b/dotfiles/lib/shellrc.sh
@@ -25,4 +25,4 @@ add_to_back_of_path "$(dotfiles_directory)/resources/python"
 add_to_back_of_path "/usr/local/sbin"
 
 # Access gnu man pages.
-MANPATH="$(brew --prefix)/opt/coreutils/libexec/gnuman:$MANPATH"
+hash brew 2> /dev/null && MANPATH="$(brew --prefix)/opt/coreutils/libexec/gnuman:$MANPATH"
diff --git a/dotfiles/lib/shellrc/aliases.sh b/dotfiles/lib/shellrc/aliases.sh
index f2d0dc46..91ab09c1 100644
--- a/dotfiles/lib/shellrc/aliases.sh
+++ b/dotfiles/lib/shellrc/aliases.sh
@@ -11,6 +11,7 @@ alias t27='tox -e py27 -- '
 alias tvenv='tox -e venv -- '
 alias reload_tmux='tmux source-file ~/.tmux.conf'
 alias which='type'
+alias ssh='ssh -A '
 
 # enables the sudoing of aliases.
 alias sudo='sudo '
diff --git a/dotfiles/lib/shellrc/ssh_agent.sh b/dotfiles/lib/shellrc/ssh_agent.sh
new file mode 100644
index 00000000..4dc2c28a
--- /dev/null
+++ b/dotfiles/lib/shellrc/ssh_agent.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+# acquired courtesy of
+# http://superuser.com/questions/141044/sharing-the-same-ssh-agent-among-multiple-login-sessions#answer-141241
+
+function sshag_findsockets {
+    find /tmp -uid $(id -u) -type s -name agent.\* 2>/dev/null
+}
+
+function sshag_testsocket {
+    if [ ! -x "$(which ssh-add)" ] ; then
+        echo "ssh-add is not available; agent testing aborted" >&2
+        return 1
+    fi
+
+    if [ X"$1" != X ] ; then
+        export SSH_AUTH_SOCK=$1
+    fi
+
+    if [ X"$SSH_AUTH_SOCK" = X ] ; then
+        return 2
+    fi
+
+    if [ -S $SSH_AUTH_SOCK ] ; then
+        ssh-add -l > /dev/null
+        if [ $? = 2 ] ; then
+            echo "Socket $SSH_AUTH_SOCK is dead!  Deleting!" >&2
+            rm -f $SSH_AUTH_SOCK
+            return 4
+        else
+            return 0
+        fi
+    else
+        echo "$SSH_AUTH_SOCK is not a socket!" >&2
+        return 3
+    fi
+}
+
+function sshag_init {
+    # ssh agent sockets can be attached to a ssh daemon process or an
+    # ssh-agent process.
+
+    AGENTFOUND=0
+
+    # Attempt to find and use the ssh-agent in the current environment
+    if sshag_testsocket ; then AGENTFOUND=1 ; fi
+
+    # If there is no agent in the environment, search /tmp for
+    # possible agents to reuse before starting a fresh ssh-agent
+    # process.
+    if [ $AGENTFOUND = 0 ] ; then
+        for agentsocket in $(sshag_findsockets) ; do
+            if [ $AGENTFOUND != 0 ] ; then break ; fi
+            if sshag_testsocket $agentsocket ; then AGENTFOUND=1 ; fi
+        done
+    fi
+
+    # If at this point we still haven't located an agent, it's time to
+    # start a new one
+    if [ $AGENTFOUND = 0 ] ; then
+        eval `ssh-agent`
+    fi
+
+    # Clean up
+    unset AGENTFOUND
+    unset agentsocket
+
+    { echo "Keys:";  ssh-add -l | sed 's/^/    /'; } >&2
+
+    # Display the found socket
+    echo $SSH_AUTH_SOCK;
+}
+
+
+# If we are not being sourced, but rather running as a subshell,
+# let people know how to use the output.
+if [[ $0 =~ sshag ]]; then
+    echo 'Output should be assigned to the environment variable $SSH_AUTH_SOCK.' >&2
+    sshag_init
+# Otherwise, make it convenient to invoke the search.
+# When the alias is invoked, it will modify the shell environment.
+else
+    alias sshag="sshag_init"
+fi