linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-19 20:29:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

12
plugins/ssh-agent/ssh-agent.plugin.zsh
View file

@ -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