diff options
| author | Robby Russell <robby@planetargon.com> | 2014-03-16 18:46:05 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-03-16 18:46:05 -0700 |
| commit | 080409a5a71359021c347a4e23e29e9514ef151a (patch) | |
| tree | 882f082545984f2d5c4f7c3f1930b42bd1304aa4 /plugins | |
| parent | fed807655a4e6196bcca417f02cf237c9d89ef68 (diff) | |
| parent | cfe468f6f6bf7cfecb2c832c39f4bf9a065ef6fd (diff) | |
| download | zsh-080409a5a71359021c347a4e23e29e9514ef151a.tar.gz zsh-080409a5a71359021c347a4e23e29e9514ef151a.tar.bz2 zsh-080409a5a71359021c347a4e23e29e9514ef151a.zip | |
Merge pull request #2603 from docwhat/ssh-agent-hostname
ssh-agent: prevent environment file from flapping
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/ssh-agent/ssh-agent.plugin.zsh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh index a1e64ad0f..2fb8d5462 100644 --- a/plugins/ssh-agent/ssh-agent.plugin.zsh +++ b/plugins/ssh-agent/ssh-agent.plugin.zsh @@ -27,7 +27,7 @@ # Florent Thoumie and Jonas Pfenniger # -local _plugin__ssh_env=$HOME/.ssh/environment-$HOST +local _plugin__ssh_env local _plugin__forwarding function _plugin__start_agent() @@ -42,12 +42,20 @@ function _plugin__start_agent() . ${_plugin__ssh_env} > /dev/null # load identies - zstyle -a :omz:plugins:ssh-agent identities identities + zstyle -a :omz:plugins:ssh-agent identities identities echo starting ssh-agent... /usr/bin/ssh-add $HOME/.ssh/${^identities} } +# Get the filename to store/lookup the environment from +if (( $+commands[scutil] )); then + # It's OS X! + _plugin__ssh_env="$HOME/.ssh/environment-$(scutil --get ComputerName)" +else + _plugin__ssh_env="$HOME/.ssh/environment-$HOST" +fi + # 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 |