diff options
Diffstat (limited to 'ssh')
-rw-r--r-- | ssh/ssh.sh | 24 |
1 files changed, 15 insertions, 9 deletions
@@ -1,10 +1,16 @@ -if [ -z "$SSH_AUTH_SOCK" ]; then - # Check for a currently running instance of the agent - RUNNING_AGENT="`ps -ax | grep 'ssh-agent -s' | grep -v grep | wc -l | tr -d '[:space:]'`" - if [ "$RUNNING_AGENT" = "0" ]; then - # Launch a new instance of the agent - ssh-agent -s &> $HOME/.ssh/ssh-agent - fi - eval `cat $HOME/.ssh/ssh-agent` > /dev/null - ssh-add &> /dev/null +# SSH Socket +# Removing Linux SSH socket and replacing it by link to wsl2-ssh-pageant socket +export SSH_AUTH_SOCK=$HOME/.ssh/agent.sock +ss -a | grep -q $SSH_AUTH_SOCK +if [ $? -ne 0 ]; then + rm -f $SSH_AUTH_SOCK + setsid nohup socat UNIX-LISTEN:$SSH_AUTH_SOCK,fork EXEC:$ZSH_BASE/ssh/wsl2-ssh-pageant.exe &>/dev/null & +fi +# GPG Socket +# Removing Linux GPG Agent socket and replacing it by link to wsl2-ssh-pageant GPG socket +export GPG_AGENT_SOCK=$HOME/.gnupg/S.gpg-agent +ss -a | grep -q $GPG_AGENT_SOCK +if [ $? -ne 0 ]; then + rm -rf $GPG_AGENT_SOCK + setsid nohup socat UNIX-LISTEN:$GPG_AGENT_SOCK,fork EXEC:"$ZSH_BASE/ssh/wsl2-ssh-pageant.exe --gpg S.gpg-agent" &>/dev/null & fi |