mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2025-12-26 02:12:33 +01:00
Cleaned up ssh-agent.
This commit is contained in:
parent
1dd3339c82
commit
bceecbccff
1 changed files with 17 additions and 43 deletions
|
|
@ -1,59 +1,33 @@
|
||||||
# INSTRUCTIONS
|
local ssh_env=$HOME/.ssh/environment-$HOST
|
||||||
#
|
# local state
|
||||||
# To enabled agent forwarding support add the following to
|
|
||||||
# your .zshrc file:
|
|
||||||
#
|
|
||||||
# zstyle :omz:plugins:ssh-agent agent-forwarding on
|
|
||||||
#
|
|
||||||
# To load multiple identies use the identities style, For
|
|
||||||
# example:
|
|
||||||
#
|
|
||||||
# zstyle :omz:plugins:ssh-agent id_rsa id_rsa2 id_github
|
|
||||||
#
|
|
||||||
# CREDITS
|
|
||||||
#
|
|
||||||
# Based on code from Joseph M. Reagle
|
|
||||||
# http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
|
|
||||||
#
|
|
||||||
# Agent forwarding support based on ideas from
|
|
||||||
# Florent Thoumie and Jonas Pfenniger
|
|
||||||
|
|
||||||
local _plugin__ssh_env=$HOME/.ssh/environment-$HOST
|
function start_agent()
|
||||||
local _plugin__forwarding
|
|
||||||
|
|
||||||
function _plugin__start_agent()
|
|
||||||
{
|
{
|
||||||
local -a identities
|
local -a identities
|
||||||
|
|
||||||
# start ssh-agent and setup environment
|
# start ssh-agent and setup environment
|
||||||
/usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${_plugin__ssh_env}
|
ssh-agent | sed 's/^echo/#echo/' >${ssh_env}
|
||||||
[[ ! -f ${_plugin__ssh_env} ]] && return 1
|
chmod 600 $ssh_env
|
||||||
chmod 600 ${_plugin__ssh_env};
|
source $ssh_env >/dev/null
|
||||||
. ${_plugin__ssh_env} > /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-add $HOME/.ssh/${^identities}
|
||||||
/usr/bin/ssh-add $HOME/.ssh/${^identities}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# 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 state
|
||||||
if [[ ${_plugin__forwarding} == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
|
|
||||||
# Add a nifty symlink for screen/tmux if agent forwarding
|
|
||||||
[[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USER-screen
|
|
||||||
|
|
||||||
elif [ -f "${_plugin__ssh_env}" ]; then
|
# if [[ $state == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
|
||||||
# Source SSH settings, if applicable
|
# [[ -L $SSH_AUTH_SOCK ]] || ln -sf $SSH_AUTH_SOCK /tmp/ssh-agent-$USER-screen
|
||||||
. ${_plugin__ssh_env} > /dev/null
|
if [[ -f $ssh_env ]]; then
|
||||||
ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
|
source $ssh_env >/dev/null
|
||||||
_plugin__start_agent;
|
ps -p $SSH_AGENT_PID >/dev/null || start_agent
|
||||||
}
|
|
||||||
else
|
else
|
||||||
_plugin__start_agent;
|
start_agent;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# tidy up after ourselves
|
# tidy up after ourselves
|
||||||
unfunction _plugin__start_agent
|
unfunction start_agent
|
||||||
unset _plugin__forwarding
|
# unset state
|
||||||
unset _plugin__ssh_env
|
unset ssh_env
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue