From bceecbccffe7c8740f4a928e69990a0c20d5c8da Mon Sep 17 00:00:00 2001
From: Simon Gomizelj <simongmzlj@gmail.com>
Date: Thu, 1 Dec 2011 09:07:26 -0500
Subject: [PATCH] Cleaned up ssh-agent.

---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 60 ++++++++------------------
 1 file changed, 17 insertions(+), 43 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index df7efd6a3..40d78ca26 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,59 +1,33 @@
-# INSTRUCTIONS
-#
-#   To enabled agent forwarding support add the following to
-#   your .zshrc file:
-#
-#     zstyle :omz:plugins:ssh-agent agent-forwarding on
-#
-#   To load multiple identies use the identities style, For
-#   example:
-#
-#     zstyle :omz:plugins:ssh-agent id_rsa id_rsa2 id_github
-#
-# CREDITS
-#
-#   Based on code from Joseph M. Reagle
-#   http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
-#
-#   Agent forwarding support based on ideas from
-#   Florent Thoumie and Jonas Pfenniger
+local ssh_env=$HOME/.ssh/environment-$HOST
+# local state
 
-local _plugin__ssh_env=$HOME/.ssh/environment-$HOST
-local _plugin__forwarding
-
-function _plugin__start_agent()
+function start_agent()
 {
   local -a identities
 
   # start ssh-agent and setup environment
-  /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${_plugin__ssh_env}
-  [[ ! -f ${_plugin__ssh_env} ]] && return 1
-  chmod 600 ${_plugin__ssh_env};
-  . ${_plugin__ssh_env} > /dev/null
+  ssh-agent | sed 's/^echo/#echo/' >${ssh_env}
+  chmod 600 $ssh_env
+  source $ssh_env >/dev/null
 
   # load identies
   zstyle -a :omz:plugins:ssh-agent identities identities
-  echo starting...
-  /usr/bin/ssh-add $HOME/.ssh/${^identities}
+  ssh-add $HOME/.ssh/${^identities}
 }
 
 # test if agent-forwarding is enabled
-zstyle -b :omz:plugins:ssh-agent agent-forwarding _plugin__forwarding
-if [[ ${_plugin__forwarding} == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
-  # Add a nifty symlink for screen/tmux if agent forwarding
-  [[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USER-screen
+# zstyle -b :omz:plugins:ssh-agent agent-forwarding state
 
-elif [ -f "${_plugin__ssh_env}" ]; then
-  # Source SSH settings, if applicable
-  . ${_plugin__ssh_env} > /dev/null
-  ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
-    _plugin__start_agent;
-  }
+# if [[ $state == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
+#   [[ -L $SSH_AUTH_SOCK ]] || ln -sf $SSH_AUTH_SOCK /tmp/ssh-agent-$USER-screen
+if [[ -f $ssh_env ]]; then
+  source $ssh_env >/dev/null
+  ps -p $SSH_AGENT_PID >/dev/null || start_agent
 else
-  _plugin__start_agent;
+  start_agent;
 fi
 
 # tidy up after ourselves
-unfunction _plugin__start_agent
-unset _plugin__forwarding
-unset _plugin__ssh_env
+unfunction start_agent
+# unset state
+unset ssh_env