.vimrc: Add default `statusline` and `titlestring`

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index b1c2da191be8b4be1e62f3b7b1fa2b8908975ed2..bc164f1a305a08561600ff07a98d2340e8a79da8 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -57,11 +57,6 @@ case "$HOME" in
    ;;
 esac
 
-
-OPS1="$OPS1\\$"
-PS1="$OPS1 "
-
-
 if test -n "$BASH_VERSION"; then
    [ "`type -t ls`" = alias ] && unalias ls
    [ "`type -t ll`" = alias ] && unalias ll
@@ -74,7 +69,7 @@ if test -n "$BASH_VERSION"; then
    has_completion() { return 0; }
    if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
       if [ "$SHELL" = /bin/bash ]; then
-         if [ -d /usr/share/bash-completion ]; then
+         if [ -d /usr/share/bash-completion -a -f /usr/share/bash-completion/bash_completion ]; then
             . /usr/share/bash-completion/bash_completion
             has_completion() { [ -r /usr/share/bash-completion/completions/$1 ]; }
          elif [ -f /etc/bash_completion ]; then
@@ -98,12 +93,6 @@ if test -n "$BASH_VERSION"; then
       fi
    fi
 
-   if [ -d "$HOME"/.bash_completion.d ]; then
-      for _compf in "$HOME"/.bash_completion.d/*; do
-         . $_compf
-      done
-   fi
-
    for cmd in builtin cgmem_nice command dbus-launch exec \
       killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg su sudo \
       time whence whereis which xargs; do
@@ -122,6 +111,12 @@ if test -n "$BASH_VERSION"; then
          ! has_completion $cmd && complete -o default -A hostname $cmd
    done
 
+   if [ -d "$HOME"/.bash_completion.d ]; then
+      for _compf in "$HOME"/.bash_completion.d/*; do
+         . $_compf
+      done
+   fi
+
    delegate_completion() {
       local prog programs
       prog=$1
@@ -154,6 +149,11 @@ if test -n "$BASH_VERSION"; then
    fi
    complete -W "`echo $BROWSER | sed 's/:/ /g'`" start-browser
 
+   if [ "`type -t short_curdir`" != function -a \
+         -r "$HOME"/admin/prog/bash_prompt ]; then
+      . "$HOME"/admin/prog/bash_prompt
+   fi
+
    #if type -p pip >/dev/null 2>&1; then
    #   eval "`pip completion --bash`"
    #   rm -rf /tmp/pip_build_"$USER"
@@ -180,6 +180,7 @@ elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
    j() { jobs; }
 fi
 
+PS1="$OPS1"
 
 # clear screen and history, logout
 chlo() { clear; cd; >$HISTFILE; unset HISTFILE; history -c; logout || exit; }
@@ -338,7 +339,12 @@ include() {
 mc() {
    if test -n "$BASH_VERSION"; then
       MC_SAVE_OPS1="$OPS1"
-      OPS1="\u@\h "
+      if [ "`type -t short_curdir`" = function ]; then
+         OPS1="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\` "
+         OPS1+="\$(prompt_git)\\$\$SHLVL "
+      else
+         OPS1="\u@\h:\W \\$"
+      fi
    fi
 
    if [ -n "$SLOWTERM" ]; then