321f5ef3596b5a3a1fb6cb40c0b19f041cde7ee2

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge branch 'ssh-agent' of http://github.com/gwjo/oh-my-zsh into gwjo-ssh-agent

Diff

 1diff --git a/plugins/ssh-agent.plugin.zsh b/plugins/ssh-agent.plugin.zsh
 2new file mode 100644
 3index 0000000000000000000000000000000000000000..fa8c45ea2217b8daff13529ccbc0ab7da87b18c5
 4--- /dev/null
 5+++ b/plugins/ssh-agent.plugin.zsh
 6@@ -0,0 +1,24 @@
 7+# Based on code from Joseph M. Reagle
 8+# http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
 9+
10+local SSH_ENV=$HOME/.ssh/environment
11+
12+function start_agent {
13+     /usr/bin/ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
14+     chmod 600 ${SSH_ENV}
15+     . ${SSH_ENV} > /dev/null
16+     /usr/bin/ssh-add;
17+}
18+
19+# Source SSH settings, if applicable
20+
21+if [ -f "${SSH_ENV}" ]; then
22+     . ${SSH_ENV} > /dev/null
23+     #ps ${SSH_AGENT_PID} doesn't work under cywgin
24+     ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
25+         start_agent;
26+     }
27+else
28+     start_agent;
29+fi
30+