Honor UID/EUID better

[ConfigScripts.git] / user / bash_logout

diff --git a/user/bash_logout b/user/bash_logout
index 80c8d841103e732e1edbb0ccb368d918b756379c..8265c8d4370f16217105c69c9429921fab2d1d28 100644 (file)
--- a/user/bash_logout
+++ b/user/bash_logout
@@ -10,14 +10,18 @@
 # individual ~/bash_logout.user file!
 #
 
-[ -e ~/.ConfigScripts.debug ] && echo " >> ~/.bash_logout ..."
+[ -e ~/.ConfigScripts.debug ] && echo " .. ~/.bash_logout ..."
 
 [ -r ~/.bash_logout.user ] && source ~/.bash_logout.user
 
-# Clean up SSH agents, if running
-[ $SSH_AGENT_PID ] && eval `ssh-agent -k`
+[ -e ~/.ConfigScripts.debug ] && echo " >> ~/.bash_logout ..."
+
+# Clean up SSH agents, if running and not using keychain(1)
+if [ $SSH_AGENT_PID ]; then
+       type -t keychain >/dev/null || eval `ssh-agent -k`
+fi
 
-# Clear console, it it is local terminal
+# Clear the console if it is a local terminal
 case `tty` in
     /dev/tty[0-9]*|/dev/ttyS[0-9]*)
        [ -x /usr/bin/clear_console ] && /usr/bin/clear_console --quiet || clear