From 72c155a7b875142b0c913a8f6c3cacda61261de8 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Thu, 10 Apr 2014 14:22:01 -0700
Subject: [PATCH] Fix ssh auth sock in tmux

---
 .gitconfig | 2 ++
 .zshenv    | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index d88cc2f..a7809e0 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,3 +20,5 @@ helper = /opt/boxen/bin/boxen-git-credential
 
 [hub]
 protocol = https
+[gitreview]
+	username = hunner
diff --git a/.zshenv b/.zshenv
index 7bb4bf2..a286328 100644
--- a/.zshenv
+++ b/.zshenv
@@ -182,8 +182,9 @@ alias gvim="gvim -font 'APL385 Unicode 8' -c 'set keymap=uniapl385'"
 alias n=nvim
 
 ## For forwarding ssh auth I think
-if [ -n "$SSH_AUTH_SOCK" ] ; then
-    ln -fs $SSH_AUTH_SOCK $HOME/.ssh-agent
+if [ ! -z "$SSH_AUTH_SOCK" -a "$SSH_AUTH_SOCK" != "$HOME/.ssh-agent" ] ; then
+    ln -fs $SSH_AUTH_SOCK "$HOME/.ssh-agent"
+    export SSH_AUTH_SOCK="$HOME/.ssh-agent"
 fi
 
 ## Add extra fonts
@@ -352,7 +353,7 @@ zpush() {
 }
 function r() {
     if [[ -n $TMUX ]]; then
-        NEW_SSH_AUTH_SOCK=`tmux showenv|grep ^SSH_AUTH_SOCK|cut -d = -f 2`
+        NEW_SSH_AUTH_SOCK=`tmux showenv|grep '^SSH_AUTH_SOCK'|cut -d = -f 2`
         if [[ -n $NEW_SSH_AUTH_SOCK ]] && [[ -S $NEW_SSH_AUTH_SOCK ]]; then
             SSH_AUTH_SOCK=$NEW_SSH_AUTH_SOCK
         fi