diff options
| author | Mitchell Riedstra <mitch@riedstra.dev> | 2025-11-25 15:04:40 -0500 |
|---|---|---|
| committer | Mitchell Riedstra <mitch@riedstra.dev> | 2025-11-25 15:04:40 -0500 |
| commit | c87f73273e3e8d6b4781207cc5f671f931f38bf6 (patch) | |
| tree | 07a05f2241eb6b468b4796de0e1a5e736d0142ed /kshrc | |
| parent | c32b46b00ddfd41e58f0d4a3fb0ca96a0f09acb2 (diff) | |
| parent | 6faf64c17a9fe1c5f5ab0f313c1d36c867097ad7 (diff) | |
| download | dotfiles-c87f73273e3e8d6b4781207cc5f671f931f38bf6.tar.gz dotfiles-c87f73273e3e8d6b4781207cc5f671f931f38bf6.tar.xz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'kshrc')
| -rw-r--r-- | kshrc | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -325,9 +325,9 @@ checkSSHAgentForward() { && [ -z "$TMUX" ] ; then echo "SSH_AUTH_SOCK=\"$SSH_AUTH_SOCK\"; export SSH_AUTH_SOCK" \ - > "$HOME"/.ssh/agent + > "$HOME"/.ssh/agent_conf elif [ -n "$TMUX" ]; then - . "$HOME"/.ssh/agent + . "$HOME"/.ssh/agent_conf fi } @@ -337,7 +337,14 @@ checkSSHAgent() { pkill -9 ssh-agent fi - ssh_agent_conf="$HOME/.ssh/agent" + # So OpenSSH 10.1 steps on my configuration, rather than passing in + # -T which doesn't exist on older SSH, simply move my configuration + # out of the way. + if [ -f "$HOME/.ssh/agent" ] ; then + rm "$HOME/.ssh/agent" + fi + + ssh_agent_conf="$HOME/.ssh/agent_conf" if [ -e "$ssh_agent_conf" ] ; then #shellcheck disable=SC1090 . "$ssh_agent_conf" |