fix: fixed gpg agent setup (no idea how...)

2 files changed, 14 insertions, 3 deletions

diff --git a/docs/cheatsheet.md b/docs/cheatsheet.md
index e0a00e9..356fcc4 100644
--- a/docs/cheatsheet.md
+++ b/docs/cheatsheet.md
@@ -120,6 +120,11 @@ While I went down this rock filled rabbit hole for the purpose of getting my Yub
 
 ### In Windows
 
+```sh
+# Install depends
+sudo apt install socat iproute2
+```
+
 Download [wsl-ssh-pageant](https://github.com/benpye/wsl-ssh-pageant)
 
 ```powershell
diff --git a/sh/gpg.sh b/sh/gpg.sh
index 3dec43f..f41d7c5 100755
--- a/sh/gpg.sh
+++ b/sh/gpg.sh
@@ -11,11 +11,17 @@ export GPG_AGENT_SOCK=$HOME/.gnupg/S.gpg-agent
 export SOCKETS=("${SSH_AUTH_SOCK}" "${GPG_AGENT_SOCK}" "${GPG_AGENT_SOCK}.extra")
 
 function gpg-init() (
+    wsl2_ssh_pageant_bin="$HOME/.ssh/wsl2-ssh-pageant.exe"
+
+    if ! test -x "$wsl2_ssh_pageant_bin"; then
+        echo >&2 "WARNING: $wsl2_ssh_pageant_bin is not executable."
+        return
+    fi
+
     for socket in "${SOCKETS[@]}"; do
-        ss -a | grep -q $socket
-        if [ $? -ne 0 ]; then
+        if ss -a | grep -q $socket; 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 &)
+            (setsid nohup socat UNIX-LISTEN:"$socket,fork" EXEC:"$wsl2_ssh_pageant_bin $([ $socket != $SSH_AUTH_SOCK ] && echo "--gpg $(basename $socket)")" >/dev/null 2>&1 &)
         fi
     done
 )