diff options
Diffstat (limited to 'plugins/ssh-agent/ssh-agent.plugin.zsh')
| -rw-r--r-- | plugins/ssh-agent/ssh-agent.plugin.zsh | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh index c4e92a1fe..2fb8d5462 100644 --- a/plugins/ssh-agent/ssh-agent.plugin.zsh +++ b/plugins/ssh-agent/ssh-agent.plugin.zsh @@ -6,11 +6,17 @@ # # zstyle :omz:plugins:ssh-agent agent-forwarding on # -# To load multiple identies use the identities style, For +# To load multiple identities use the identities style, For # example: # -# zstyle :omz:plugins:ssh-agent id_rsa id_rsa2 id_github +# zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github # +# To set the maximum lifetime of the identities, use the +# lifetime style. The lifetime may be specified in seconds +# or as described in sshd_config(5) (see TIME FORMATS) +# If left unspecified, the default lifetime is forever. +# +# zstyle :omz:plugins:ssh-agent lifetime 4h # # CREDITS # @@ -21,24 +27,35 @@ # Florent Thoumie and Jonas Pfenniger # -local _plugin__ssh_env=$HOME/.ssh/environment-$HOST +local _plugin__ssh_env local _plugin__forwarding function _plugin__start_agent() { local -a identities + local lifetime + zstyle -s :omz:plugins:ssh-agent lifetime lifetime # start ssh-agent and setup environment - /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${_plugin__ssh_env} + /usr/bin/env ssh-agent ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' > ${_plugin__ssh_env} chmod 600 ${_plugin__ssh_env} . ${_plugin__ssh_env} > /dev/null # load identies - zstyle -a :omz:plugins:ssh-agent identities identities - echo starting... + 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 @@ -48,7 +65,7 @@ if [[ ${_plugin__forwarding} == "yes" && -n "$SSH_AUTH_SOCK" ]]; then elif [ -f "${_plugin__ssh_env}" ]; then # Source SSH settings, if applicable . ${_plugin__ssh_env} > /dev/null - ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || { + ps x | grep ${SSH_AGENT_PID} | grep ssh-agent > /dev/null || { _plugin__start_agent; } else |