X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fbash_login;h=d390e56cbc8cd5f51e0d0ba551b9d377e67eac32;hb=8abb4738f8a660b9f8afa1f480303e43a81d60b4;hp=39677ccb9b8ec056a9f99ae0909ca97a0f3c1cfa;hpb=1140ca8d56832ae529db0f353112ac192cdf9432;p=clearscm.git

diff --git a/rc/bash_login b/rc/bash_login
index 39677cc..d390e56 100644
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -56,7 +56,11 @@ if [ $ARCHITECTURE = 'sun' ]; then
 else
   id=id
   tr=tr
-  TERM=xterm
+  if [ $ARCHITECTURE = 'cygwin' ]; then
+    TERM=cygwin
+  else
+    TERM=xterm
+  fi
 fi
 
 # Set colors
@@ -117,8 +121,11 @@ if [ -r /etc/bash_completion -a $ARCHITECTURE != "cygwin" ]; then
   source /etc/bash_completion
 fi
 
-if [ -x ~/.rc/logout ]; then
-  trap "~/.rc/logout" 0
+# We specify /home/$USER here so that when we sudo to another user 
+# we will only trap logout if that user also has a ~/.rc/logout
+# (doubtfull).
+if [ -x /home/$USER/.rc/logout ]; then
+  trap "/home/$USER/.rc/logout" 0
 fi
 
 # ClearCase Stuff