adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2603 from docwhat/ssh-agent-hostname

Browse Source 
ssh-agent: prevent environment file from flapping
This commit is contained in:
Robby Russell 2014-03-16 18:46:05 -07:00
commit 080409a5a7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/ssh-agent/ssh-agent.plugin.zsh
View File

@ -27,7 +27,7 @@
# Florent Thoumie and Jonas Pfenniger # Florent Thoumie and Jonas Pfenniger
# #
local _plugin__ssh_env=$HOME/.ssh/environment-$HOST local _plugin__ssh_env
local _plugin__forwarding local _plugin__forwarding
function _plugin__start_agent() function _plugin__start_agent()
@ -48,6 +48,14 @@ function _plugin__start_agent()
/usr/bin/ssh-add $HOME/.ssh/${^identities} /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 # test if agent-forwarding is enabled
zstyle -b :omz:plugins:ssh-agent agent-forwarding _plugin__forwarding zstyle -b :omz:plugins:ssh-agent agent-forwarding _plugin__forwarding
if [[ ${_plugin__forwarding} == "yes" && -n "$SSH_AUTH_SOCK" ]]; then if [[ ${_plugin__forwarding} == "yes" && -n "$SSH_AUTH_SOCK" ]]; then