linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-26 21:51:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ssh-agent: prevent environment file from flapping

Browse source 
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.
This commit is contained in:
Christian Höltje 2014-03-13 14:44:58 -04:00
parent b6cbba9dfe
commit cfe468f6f6
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