Export XTERM, handle locale a bit better

git-svn-id: file:///svn/tfheen/trunk/dotfiles@145 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf

diff --git a/environment b/environment
index 5166f6498b5773c9141919a5272ebd2bfaf0775c..54e9b1d6855168c128afe3a377fbfa70f79c0137 100644 (file)
--- a/environment
+++ b/environment
@@ -57,9 +57,9 @@ case `uname -s` in
 esac
 
 if type -p locale > /dev/null 2>&1; then
-    if locale -a | grep -q no_NO; then
+    if locale -a | grep -q '^no_NO$' ; then
         LANG=no_NO
-    elif locale -a | grep -q en_US; then
+    elif locale -a | grep -q '^en_US$'; then
         LANG=en_US
     fi
 fi
@@ -87,4 +87,4 @@ esac
 
 export LS_OPTIONS CVSROOT EDITOR TZ WWW_HOME LESSOPEN LESS RSYNC_RSH
 export CVS_RSH PILOTPORT PILOTRATE LANG DEBEMAIL CVSEDITOR ldlib
-export HOSTNAME DOMAINNAME PATH EMAIL
+export HOSTNAME DOMAINNAME PATH EMAIL XTERM