diff options
| author | Christian Höltje <choltje@us.ibm.com> | 2014-03-13 14:44:58 -0400 |
|---|---|---|
| committer | Christian Höltje <choltje@us.ibm.com> | 2014-03-13 14:44:58 -0400 |
| commit | cfe468f6f6bf7cfecb2c832c39f4bf9a065ef6fd (patch) | |
| tree | 6d5fb8e96fd5bfeb8afa169cf7a8308de04c0560 | |
| parent | b6cbba9dfee5985232b473e94595c2fb1ab83715 (diff) | |
| download | zsh-cfe468f6f6bf7cfecb2c832c39f4bf9a065ef6fd.tar.gz zsh-cfe468f6f6bf7cfecb2c832c39f4bf9a065ef6fd.tar.bz2 zsh-cfe468f6f6bf7cfecb2c832c39f4bf9a065ef6fd.zip | |
ssh-agent: prevent environment file from flapping
On an OS X laptop, the variable `$HOST` changes a lot depending
on what wifi network you're connected to. This causes a lot
of `~/.ssh/environment-$HOST` files to be created and
causes multiple ssh-agents to created.
Instead, use `scutil --get ComputerName` to get something
more stable.
| -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 |