1 files changed, 21 insertions, 26 deletions
diff --git a/sh/gpg.sh b/sh/gpg.sh
index ea87d05..1909fad 100644..100755
--- a/sh/gpg.sh
+++ b/sh/gpg.sh
@@ -4,41 +4,36 @@
 
 # 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:"$DOTFILES/ssh/wsl2-ssh-pageant.exe" &>/dev/null &)
-fi
-
+# 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:"$DOTFILES/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 SSH_AUTH_SOCK=$HOME/.ssh/agent.sock
 export GPG_AGENT_SOCK=$HOME/.gnupg/S.gpg-agent
+export SOCKETS=("${SSH_AUTH_SOCK}" "${GPG_AGENT_SOCK}" "${GPG_AGENT_SOCK}.extra")
 
-export GPG_SOCKETS=("${GPG_AGENT_SOCK}" "${GPG_AGENT_SOCK}.extra" "${GPG_AGENT_SOCK}.ssh")
-
-for socket in "${GPG_SOCKETS[@]}"; do
-    ss -a | grep -q $socket
-    if [ $? -ne 0 ]; then
-        rm -rf $socket
-        (setsid nohup socat UNIX-LISTEN:$socket,fork EXEC:"$DOTFILES/ssh/wsl2-ssh-pageant.exe --gpg $(basename $socket)" &>/dev/null &)
-    fi
-done
+function gpg-init() (
+    for socket in "${SOCKETS[@]}"; do
+        ss -a | grep -q $socket
+        if [ $? -ne 0 ]; then
+            rm -rf $socket
+            (setsid nohup socat UNIX-LISTEN:$socket,fork EXEC:"$DOTFILES/ssh/wsl2-ssh-pageant.exe $([ $socket != $SSH_AUTH_SOCK ] && echo "--gpg $(basename $socket)")" &>/dev/null &)
+        fi
+    done
+)
 
- 
-alias gpgrst=gpg-reset
 # Reload
 function gpg-reset() {
     gpg-connect-agent.exe KILLAGENT /bye &>/dev/null
-    
-    for socket in "${GPG_SOCKETS[@]}"; do
-        [ -e $socket ] && rm $socket
-    done
     pkill -f 'socat.*wsl2-ssh-pageant.exe'
     gpg-connect-agent.exe /bye &>/dev/null
-
-    for socket in "${GPG_SOCKETS[@]}"; do
-        (setsid nohup socat UNIX-LISTEN:$socket,fork EXEC:"$DOTFILES/ssh/wsl2-ssh-pageant.exe --gpg $(basename $socket)" &>/dev/null &)
-    done
+    gpg-init
 }
+
+alias gpgrst=gpg-reset
+gpg-init