diff options
| -rw-r--r-- | ssh/ssh.sh | 24 | ||||
| -rw-r--r-- | zsh/wsl.zsh | 26 |
2 files changed, 25 insertions, 25 deletions
@@ -1,16 +1,10 @@ -# 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 & +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 fi diff --git a/zsh/wsl.zsh b/zsh/wsl.zsh index abbb0f6..abccb29 100644 --- a/zsh/wsl.zsh +++ b/zsh/wsl.zsh @@ -48,13 +48,19 @@ function r-cut() { (( ${+aliases[cb]} )) && printf "$CUTBUFFER" | cb } -# YubiKey - GPG: https://blog.nimamoh.net/yubi-key-gpg-wsl2/ -gpg-agent-relay start -export SSH_AUTH_SOCK=$HOME/.gnupg/S.gpg-agent.ssh - -# export SSH_AUTH_SOCK=/tmp/wincrypt-hv.sock -# ss -lnx | grep -q $SSH_AUTH_SOCK -# if [ $? -ne 0 ]; then -# rm -f $SSH_AUTH_SOCK -# (setsid nohup socat UNIX-LISTEN:$SSH_AUTH_SOCK,fork SOCKET-CONNECT:40:0:x0000x33332222x02000000x00000000 >/dev/null 2>&1) -# fi +# 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 |