properly select xterm if stterm isn't in termcap

[home-base.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 56950bfba2155d5f50cee9d4d4068553739c037a..0773f1d0e3bbcb825f1fdcbc7a7ed4ff8cf9e9ac 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -20,60 +20,66 @@ if [ "$PS1" ]; then
     fi;
     # bts debian options
 
+    if [ -e bin/faf ]; then
+       complete -F _command faf
+    fi;
+
     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-2.2'
-    alias emc='sane_editor'
 
-    alias svn-b="svn-buildpackage --svn-builder 'pdebuild --buildresult ..' --svn-ignore-new"
+    # See if we're in a chroot
+    if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
+       debian_chroot=$(cat /etc/debian_chroot)
+    fi
 
-    # set a fancy prompt
-    #printf '\33]2;%s\007'
     # we want to set the color based on what machine we're on
     # if it's a remote, SSH_CONNECTION will be set
-    if [ -n "$SSH_CONNECTION" ]; then
+    # 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})/) {
-              my $num = unpack(q(L),pack(q(h*),$1));
+              my $num = unpack(q(L),pack(q(H*),$1));
               my @col = map {(qq(0;${_}m),qq(1;${_}m))} 31..37;
-              my $col = $col[$num%$#col];
+              my $col = $col[$num % @col];
               if ($col eq q(0;36m)) {
                  $col = q(1;30m);
               }
               print $col;
               }')
-       PS1="\[\033[$COLOR\]\h \[\033[0;36m\]\t \w$\[\033[0m\] "
+       PS1="${debian_chroot:+($debian_chroot)}\[\033[$COLOR\]\h \[\033[0;36m\]\t \w$\[\033[0m\] "
        unset COLOR
     else
-       PS1="\[\033[0;36m\]\h \t \w$\[\033[0m\] "
+       PS1="${debian_chroot:+($debian_chroot)}\[\033[0;36m\]\h \t \w$\[\033[0m\] "
     fi;
     # \[\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*)
@@ -91,7 +97,8 @@ if [ "$PS1" ]; then
     fi;
 
     # set up ssh-agent
-    if which ssh-agent >/dev/null && [ -d ~/.ssh ]; then
+    if which ssh-agent >/dev/null && [ -d ~/.ssh ] &&  \
+       [ -z "$SSH_CONNECTION" ] &&  [ -z "$SSH_CLIENT" ]; then 
 #      for 
        if [ -e ~/.ssh/ssh_agent_info ] && \
            [ -n "$(awk -F '[=;]' '/^SSH_AGENT_PID/{print $2}' ~/.ssh/ssh_agent_info)" ] && \
@@ -113,35 +120,26 @@ if [ "$PS1" ]; then
        LANG=C
     fi;
     export LANG
-    export PATH="~/bin:$PATH"
+    
+    # If we're running on liszt, include /var/list/.bin in the path
+    if [ "$(hostname)" == "liszt" ] && [ -d /var/list/.bin ]; then
+       PATH="/var/list/.bin:$PATH"
+    fi;
+    export PATH="$(getent passwd $(id -u)|awk -F: '{print $6}')/bin:$PATH"
+    
     if [ ! -e ~/tmp ]; then
        mkdir ~/tmp;
     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 ()
        {
-            builtin cd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
+           # use pushd instead of cd
+           if [ -z "$1" ] || [ "$1" == "-" ]; then
+               builtin cd "$@"; # && [ -r .todo ] && devtodo ${TODO_OPTIONS};
+           else
+               builtin pushd "$@" >/dev/null; # && [ -r .todo ] && devtodo ${TODO_OPTIONS};
+           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