summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorToby Vincent <tobyv13@gmail.com>2021-04-28 01:22:17 -0500
committerToby Vincent <tobyv13@gmail.com>2021-04-28 01:22:17 -0500
commitf38eb310665c334521e59f870362f3a54397cd11 (patch)
treef7f54aa6412e570035347f3d5d4ebde5b03d2de3
parentdb7ddbb0141216c1b4c96e4f6b9ab62d656b3d4b (diff)
feat: improved gpg-reset
-rw-r--r--zsh/wsl.zsh10
1 files changed, 5 insertions, 5 deletions
diff --git a/zsh/wsl.zsh b/zsh/wsl.zsh
index 6e8db68..b742150 100644
--- a/zsh/wsl.zsh
+++ b/zsh/wsl.zsh
@@ -71,11 +71,11 @@ fi
alias gpgrst=gpg-reset
# Reload
function gpg-reset() {
- gpg-connect-agent.exe KILLAGENT /bye
- rm $HOME/.gnupg/S.gpg-agent*
- rm $HOME/.ssh/agent.sock
- pkill socat
- gpg-connect-agent.exe /bye
+ gpg-connect-agent.exe KILLAGENT /bye &>/dev/null
+ [ -e $GPG_AGENT_SOCK ] && rm $GPG_AGENT_SOCK
+ [ -e $SSH_AUTH_SOCK ] && rm $SSH_AUTH_SOCK
+ pkill -f 'socat.*wsl2-ssh-pageant.exe'
+ gpg-connect-agent.exe /bye &>/dev/null
(setsid nohup socat UNIX-LISTEN:$SSH_AUTH_SOCK,fork EXEC:"$ZSH_BASE/ssh/wsl2-ssh-pageant.exe" &>/dev/null &)
(setsid nohup socat UNIX-LISTEN:$GPG_AGENT_SOCK,fork EXEC:"$ZSH_BASE/ssh/wsl2-ssh-pageant.exe --gpg S.gpg-agent" &>/dev/null &)
} \ No newline at end of file