浏览代码

fix(ssh-agent): don't start new agent if screen/tmux symlink exists (#12297)

Alexander Schlüter 1 年之前
父节点
当前提交
3e05befaee
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      plugins/ssh-agent/ssh-agent.plugin.zsh

+ 4 - 2
plugins/ssh-agent/ssh-agent.plugin.zsh

@@ -98,8 +98,10 @@ function _add_identities() {
 
 
 # Add a nifty symlink for screen/tmux if agent forwarding is enabled
 # Add a nifty symlink for screen/tmux if agent forwarding is enabled
 if zstyle -t :omz:plugins:ssh-agent agent-forwarding \
 if zstyle -t :omz:plugins:ssh-agent agent-forwarding \
-   && [[ -n "$SSH_AUTH_SOCK" && ! -L "$SSH_AUTH_SOCK" ]]; then
-  ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
+   && [[ -n "$SSH_AUTH_SOCK" ]]; then
+  if [[ ! -L "$SSH_AUTH_SOCK" ]]; then
+    ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
+  fi
 else
 else
   _start_agent
   _start_agent
 fi
 fi