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

Clean up formatting of ssh-agent plugin

Browse Source
This commit is contained in:
Marc Cornellà 2016-08-21 01:08:34 +02:00
parent b60acddefe
commit cb0833ac13
1 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,49 +1,42 @@
local _plugin__ssh_env typeset _agent_forwarding _ssh_env_cache
local _plugin__forwarding
function _plugin__start_agent() function _start_agent() {
{
local -a identities
local lifetime local lifetime
zstyle -s :omz:plugins:ssh-agent lifetime lifetime local -a identities
# start ssh-agent and setup environment # start ssh-agent and setup environment
ssh-agent ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' >! ${_plugin__ssh_env} zstyle -s :omz:plugins:ssh-agent lifetime lifetime
chmod 600 ${_plugin__ssh_env}
. ${_plugin__ssh_env} > /dev/null ssh-agent ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' >! $_ssh_env_cache
chmod 600 $_ssh_env_cache
. $_ssh_env_cache > /dev/null
# load identies # load identies
zstyle -a :omz:plugins:ssh-agent identities identities zstyle -a :omz:plugins:ssh-agent identities identities
echo starting ssh-agent...
echo starting ssh-agent...
ssh-add $HOME/.ssh/${^identities} ssh-add $HOME/.ssh/${^identities}
} }
# Get the filename to store/lookup the environment from # Get the filename to store/lookup the environment from
if (( $+commands[scutil] )); then _ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
# 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 _agent_forwarding
if [[ ${_plugin__forwarding} == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
if [[ $_agent_forwarding == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
# Add a nifty symlink for screen/tmux if agent forwarding # Add a nifty symlink for screen/tmux if agent forwarding
[[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USER-screen [[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USER-screen
elif [[ -f "$_ssh_env_cache" ]]; then
elif [ -f "${_plugin__ssh_env}" ]; then
# Source SSH settings, if applicable # Source SSH settings, if applicable
. ${_plugin__ssh_env} > /dev/null . $_ssh_env_cache > /dev/null
ps x | grep ${SSH_AGENT_PID} | grep ssh-agent > /dev/null || { ps x | grep $SSH_AGENT_PID | grep ssh-agent > /dev/null || {
_plugin__start_agent; _start_agent
} }
else else
_plugin__start_agent; _start_agent
fi fi
# tidy up after ourselves # tidy up after ourselves
unfunction _plugin__start_agent unset _agent_forwarding _ssh_env_cache
unset _plugin__forwarding unfunction _start_agent
unset _plugin__ssh_env