summaryrefslogtreecommitdiffstatshomepage
path: root/ssh
diff options
context:
space:
mode:
authorToby Vincent <tobyv13@gmail.com>2021-04-17 13:59:20 -0500
committerToby Vincent <tobyv13@gmail.com>2021-04-17 13:59:20 -0500
commit66f2661eaa4deec8197cf561ef588094812200da (patch)
tree0a66d5f043108227aead6ce8a33664bfca687d98 /ssh
parent62f2f49b168ae9393d16b492364d0c76b2fe18bc (diff)
feat: added gpg socket support
Diffstat (limited to 'ssh')
-rw-r--r--ssh/ssh.sh24
1 files changed, 15 insertions, 9 deletions
diff --git a/ssh/ssh.sh b/ssh/ssh.sh
index 9abfbdb..3917bae 100644
--- a/ssh/ssh.sh
+++ b/ssh/ssh.sh
@@ -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