diff options
| author | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-17 09:32:57 -0400 |
|---|---|---|
| committer | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-17 09:32:57 -0400 |
| commit | 5a586670d73dbbda97d124e33398aabf21597659 (patch) | |
| tree | 770a29ab869a831afdeb2fd0096e9af0b4af6c61 /plugins/ssh-agent | |
| parent | 223fd60ba597b8c23569c65878d766c3c933fa70 (diff) | |
| parent | ca900216302aa1138c793971cf877b5d4e88fb06 (diff) | |
| download | zsh-5a586670d73dbbda97d124e33398aabf21597659.tar.gz zsh-5a586670d73dbbda97d124e33398aabf21597659.tar.bz2 zsh-5a586670d73dbbda97d124e33398aabf21597659.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'plugins/ssh-agent')
| -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 |