mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-16 10:50:07 +00:00
53c3567cc3
On systems where the shell cannot be changed because of a strict security policy, ssh-agent will use the syntax of whatever the default $SHELL is. For instance, if the default shell is tcsh, ssh-agent will use the c-shell style (setenv). This change forces ssh-agent to use bourne-style syntax since that has to be later interpreted by zsh. Consequently, the environment file will contain `export' statements from now on (instead of `setenv').
42 lines
1.2 KiB
Bash
42 lines
1.2 KiB
Bash
typeset _agent_forwarding _ssh_env_cache
|
|
|
|
function _start_agent() {
|
|
local lifetime
|
|
local -a identities
|
|
|
|
# start ssh-agent and setup environment
|
|
zstyle -s :omz:plugins:ssh-agent lifetime lifetime
|
|
|
|
ssh-agent -s ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' >! $_ssh_env_cache
|
|
chmod 600 $_ssh_env_cache
|
|
. $_ssh_env_cache > /dev/null
|
|
|
|
# load identies
|
|
zstyle -a :omz:plugins:ssh-agent identities identities
|
|
|
|
echo starting ssh-agent...
|
|
ssh-add $HOME/.ssh/${^identities}
|
|
}
|
|
|
|
# Get the filename to store/lookup the environment from
|
|
_ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
|
|
|
|
# test if agent-forwarding is enabled
|
|
zstyle -b :omz:plugins:ssh-agent agent-forwarding _agent_forwarding
|
|
|
|
if [[ $_agent_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 "$_ssh_env_cache" ]]; then
|
|
# Source SSH settings, if applicable
|
|
. $_ssh_env_cache > /dev/null
|
|
ps -o cmd -p $SSH_AGENT_PID | grep -q ssh-agent || {
|
|
_start_agent
|
|
}
|
|
else
|
|
_start_agent
|
|
fi
|
|
|
|
# tidy up after ourselves
|
|
unset _agent_forwarding _ssh_env_cache
|
|
unfunction _start_agent
|