Fixes for solaris b0rkenness

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

diff --git a/environment b/environment
index 0b556eba91e9ff5bbbb15ce8f2ac0bdeb26655c9..6784df279343d8a5ab3321abc6594ab6fd443acf 100644 (file)
--- a/environment
+++ b/environment
@@ -39,6 +39,7 @@ PILOTPORT=/dev/tts/0
 DEBEMAIL=tfheen@debian.org
 DEBFULLNAME="Tollef Fog Heen"
 CVSEDITOR=vi
+XTERM=xterm
 
 if test `uname -s` = "Linux" && test `uname -m` = i686; then
     ldlib=ld-linux.so.2
@@ -55,25 +56,33 @@ case `uname -s` in
         ;;
 esac
 
+if type -p locale > /dev/null 2>&1; then
+    if locale -a | grep -q no_NO; then
+        LANG=no_NO
+    elif locale -a | grep -q en_US; then
+        LANG=en_US
+    fi
+fi
+
 case "$DOMAINNAME" in
-    pvv*|idi.ntnu.no|debian.org|cysteine*)
+#    pvv*|idi.ntnu.no|debian.org|cysteine*)
         # Sigh, no locale here, at least not uniformly.
-        case "$HOSTNAME" in
-            arabella*)
-                export LANG=no_NO
-                ;;
-        esac
-        ;;
+#        case "$HOSTNAME" in
+#            arabella*)
+#                export LANG=no_NO
+#                ;;
+#        esac
+#        ;;
     samfundet*)
         mesg y
-        export EMAIL=tfheen@samfundet.no
+        EMAIL=tfheen@samfundet.no
         ;;
     *)
-        export LANG=no_NO
+        :
         ;;
 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
+export HOSTNAME DOMAINNAME PATH EMAIL