diff options
author | Robby Russell <robby@planetargon.com> | 2011-03-16 08:05:19 -0700 |
---|---|---|
committer | Robby Russell <robby@planetargon.com> | 2011-03-16 08:05:19 -0700 |
commit | 23556491e66ab0229034681e1cce8481936e7e7b (patch) | |
tree | 341efe5a5183877523db8bf125f7caa65c6df688 /plugins | |
parent | bb3414ec002b106bb868f50231644c64a36298e5 (diff) | |
parent | 9d991a5080bea5c71e1b5f6838d5498c908c434b (diff) | |
download | zsh-23556491e66ab0229034681e1cce8481936e7e7b.tar.gz zsh-23556491e66ab0229034681e1cce8481936e7e7b.tar.bz2 zsh-23556491e66ab0229034681e1cce8481936e7e7b.zip |
Merge branch 'ssh-agent-append-host-to-environment' of https://github.com/trcjr/oh-my-zsh into trcjr-ssh-agent-append-host-to-environment
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/ssh-agent/ssh-agent.plugin.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh index ce0d645c1..0efc4546f 100644 --- a/plugins/ssh-agent/ssh-agent.plugin.zsh +++ b/plugins/ssh-agent/ssh-agent.plugin.zsh @@ -1,7 +1,7 @@ # Based on code from Joseph M. Reagle # http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html -local SSH_ENV=$HOME/.ssh/environment +local SSH_ENV=$HOME/.ssh/environment-$HOST function start_agent { /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV} |