properly select xterm if stterm isn't in termcap

[home-base.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 0b9fb0c03176ecc848c83141e45fc705171ed407..0773f1d0e3bbcb825f1fdcbc7a7ed4ff8cf9e9ac 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -27,17 +27,13 @@ if [ "$PS1" ]; then
     export DEBEMAIL="don@debian.org"
     export DEBHOME="$(eval 'echo' '~/projects/debian')"
 
+    export GTK_IM_MODULE=xim
+    export QT_IM_MODULE=xim
+
     # enable color support of ls and also add handy aliases
     eval `dircolors -b`
     alias ls='ls --color=auto'
-    alias gr='gimp-remote'
-    alias emc='sane_editor'
-
-    alias svn-b="svn-buildpackage --svn-builder 'pdebuild --buildresult ..' --svn-ignore-new"
 
-    # set a fancy prompt
-    #printf '\33]2;%s\007'
-    
     # See if we're in a chroot
     if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
        debian_chroot=$(cat /etc/debian_chroot)
@@ -47,6 +43,9 @@ if [ "$PS1" ]; then
     # if it's a remote, SSH_CONNECTION will be set
     # set variable identifying the chroot you work in (used in the prompt below)
     
+    # disable terminal bell
+    bind 'set bell-style none'
+
     if [ -n "$SSH_CONNECTION" -o -n "$SSH_CLIENT" ]; then
        # figure out what color to use
        COLOR=$(hostname|md5sum|perl -ne 'if (/^([a-f\d]{8})/) {
@@ -66,27 +65,21 @@ if [ "$PS1" ]; then
     # \[\033[1;36m\][\w]\n\[\033[0;36m\][\h|\t]$ \[\033[0m\]
 
     # make sure the term we're using exists in the termcap
-    TOEOPT='-a'
-    if ! toe $TOEOPT >/dev/null 2>&1; then
-       TOEOPT=''
+    if [[ "$TERM" =~ "rxvt-" ]] && which tput >/dev/null 2>&1; then
+        if [[ -z "$(tput longname 2>/dev/null)" ]]; then
+            TERM="xterm-${TERM##rxvt-}"
+            export TERM
+        fi;
     fi;
-    if ! toe $TOEOPT|grep -q "^$TERM   "; then
-       # if it doesn't, try to switch
-       case $TERM in
-           rxvt*)
-               TERM="rxvt"
-               ;;
-           xterm*)
-               TERM="xterm"
-               ;;
-           *)
-               ;;
-       esac
-       export TERM;
+    if [[ "$TERM" =~ "stterm-" ]] && which tput >/dev/null 2>&1; then
+        if [[ -z "$(tput longname 2>/dev/null)" ]]; then
+            TERM="xterm-${TERM##stterm-}"
+            export TERM
+        fi;
     fi;
     # If this is an xterm set the title to user@host:dir
     case $TERM in
-       screen|xterm*)
+       screen|xterm*|stterm*)
             PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"'
             ;;
        rxvt*)
@@ -139,13 +132,6 @@ if [ "$PS1" ]; then
     fi;
     export TMPDIR="$(echo ~/tmp)";
 
-#     if [ -n "$(which devtodo)" ]; then
-#      for a in tda tdd tde; do
-#          alias "s${a}"="STODO_NO_COMMIT=1 $a"
-#      done;
-# 
-#      TODO_OPTIONS="--timeout --summary"
-
        cd ()
        {
            # use pushd instead of cd
@@ -156,17 +142,4 @@ if [ "$PS1" ]; then
            fi;
        }
 
-#      pushd ()
-#      {
-#             builtin pushd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
-#      }
-#      
-#      popd ()
-#      {
-#             builtin popd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
-#      }              
-       
-        # Run todo initially upon login
-#      devtodo ${TODO_OPTIONS}
-#     fi;
 fi