Drop pilot stuff, fix up xterm stuff

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

diff --git a/environment b/environment
index 94cac91baa35a4e14bf38072d1c6913927c8af72..11fe1bccedcddb766e6a1243557bc6034bfb06bf 100644 (file)
--- a/environment
+++ b/environment
@@ -170,13 +170,12 @@ test -x "$HOME/bin/lesspipe" && LESSOPEN="|$HOME/bin/lesspipe '%s'"
 LESS="-m"
 RSYNC_RSH=ssh
 CVS_RSH=ssh
-PILOTRATE=115200
 #MAIL=/var/spool/mail/tfheen
 DEBEMAIL=tfheen@debian.org
 DEBFULLNAME="Tollef Fog Heen"
 CVSEDITOR="emacs -nw"
 SVN_EDITOR="emacs -nw"
-XTERM=$(findcommand pterm Eterm gnome-terminal xterm)
+XTERM=$(findcommand gnome-terminal pterm Eterm xterm)
 PAGER=less
 GNUSTEP_USER_ROOT="$HOME/.GNUstep"
 OOO_DISABLE_RECOVERY=True
@@ -205,11 +204,9 @@ esac
 if [ -z "$LANG" ] || [ "$LANG" = "C" ]; then
     if findcommand locale >/dev/null; then
         if locale -a | grep -q '^nb_NO.utf8$' ; then
-            LANG=nb_NO.utf8
-        elif locale -a | grep -q '^no_NO$' ; then
-            LANG=no_NO
-        elif locale -a | grep -q '^en_US$'; then
-            LANG=en_US
+            LANG=nb_NO.UTF-8
+        elif locale -a | grep -q '^en_US.utf8$'; then
+            LANG=en_US.UTF-8
         fi
     fi
 fi
@@ -227,18 +224,6 @@ if [ -z "$LANG" ] || [ "$LANG" = "C" ]; then
     fi
 fi
 
-case "$HOSTNAME" in
-    golem*)
-        PILOTPORT=/dev/ttyS0
-        ;;
-    yiwaz*)
-        PILOTPORT=/dev/usb/tts/0
-        ;;
-    *)
-        PILOTPORT=
-        ;;
-esac
-
 case "$DOMAINNAME" in
     samfundet*)
         mesg y
@@ -252,9 +237,9 @@ esac
 removepathelem "\\."
 
 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 XTERM SVN_EDITOR GNUSTEP_USER_ROOT
-export GREP_OPTIONS OOO_DISABLE_RECOVERY
+export CVS_RSH LANG DEBEMAIL CVSEDITOR ldlib HOSTNAME DOMAINNAME PATH 
+export EMAIL XTERM SVN_EDITOR GNUSTEP_USER_ROOT GREP_OPTIONS 
+export OOO_DISABLE_RECOVERY GTK_IM_MODULE
 
 if [ -f "$HOME/.gnupg/gpg-agent-info-$HOSTNAME" ]; then
     . "$HOME/.gnupg/gpg-agent-info-$HOSTNAME"