From 007059cab804dcbe2ceeb2a9d684b18786f00c95 Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Fri, 29 Sep 2023 11:43:14 +0100
Subject: [PATCH] Modify ssh-agent killing in .bash_logout.

---
 .bash_logout | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.bash_logout b/.bash_logout
index 0b22265..6eb6716 100644
--- a/.bash_logout
+++ b/.bash_logout
@@ -15,10 +15,8 @@ fi
 
 hash ssh-add ssh-agent >/dev/null 2>&1 && {
   # Stop any started ssh-agent as long as the shell level is 1 and we're not on a tty.
-  (( SHLVL == 1 )) && [[ "$(tty)" == /dev/pts/* ]] && [[ -n "$SSH_AGENT_PID" ]] && {
-    eval "$(ssh-agent -k)" >/dev/null
-    (( $? != 0 )) && printf "\\033[1;31;40m%s\\033[0;39m\\n" "Failed to stop ssh-agent." >&2
-    sleep 5
+  (( SHLVL == 1 )) && [[ "$(tty)" != /dev/tty* ]] && [[ -n "$SSH_AGENT_PID" ]] && {
+    eval "$(ssh-agent -k >/dev/null 2>&1)" >/dev/null || printf "\\033[1;31;40m%s\\033[0;39m\\n" "Failed to stop ssh-agent." >&2
   }
 
   # Update the ~/.ssh/agents file.