linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-04-24 04:29:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge e64dd96786 into 7fabc8bca4

Browse source
This commit is contained in:
Xu Cheng 2016-06-25 10:26:51 +00:00 • committed by GitHub
commit 8636e5b1ee
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/ssh-agent/ssh-agent.plugin.zsh
View file

@ -37,7 +37,7 @@ function _plugin__start_agent()
zstyle -s :omz:plugins:ssh-agent lifetime lifetime zstyle -s :omz:plugins:ssh-agent lifetime lifetime
# start ssh-agent and setup environment # start ssh-agent and setup environment
/usr/bin/env ssh-agent ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' > ${_plugin__ssh_env} (umask 0077; /usr/bin/env ssh-agent ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' > ${_plugin__ssh_env})
chmod 600 ${_plugin__ssh_env} chmod 600 ${_plugin__ssh_env}
. ${_plugin__ssh_env} > /dev/null . ${_plugin__ssh_env} > /dev/null
@ -60,7 +60,10 @@ fi
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
# 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 if [[ ! -L $SSH_AUTH_SOCK ]]; then
(umask 0077; ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USER-screen)
export SSH_AUTH_SOCK="/tmp/ssh-agent-$USER-screen"
fi
elif [ -f "${_plugin__ssh_env}" ]; then elif [ -f "${_plugin__ssh_env}" ]; then
# Source SSH settings, if applicable # Source SSH settings, if applicable