bash: Separate host from current dir in `PS1` with `:`

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index 541417a422ae2ff1c5040e1e58c70f74b8867034..6973d7ab0a04a70423b66f9290b2eb96a8a18ccb 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -15,8 +15,6 @@ esac
 # Stop if non-interactive shell
 [ -z "$PS1" ] && return
 
-PS1="$OPS1$SHLVL "
-
 if test -n "$BASH_VERSION"; then
    # append to the history file, don't overwrite it
    shopt -s histappend
@@ -59,6 +57,7 @@ case "$HOME" in
    ;;
 esac
 
+PS1="$OPS1$SHLVL "
 
 if test -n "$BASH_VERSION"; then
    [ "`type -t ls`" = alias ] && unalias ls
@@ -153,10 +152,12 @@ if test -n "$BASH_VERSION"; then
    complete -W "`echo $BROWSER | sed 's/:/ /g'`" start-browser
 
    if [ "`type -t short_curdir`" != function -a \
-         -r "$HOME"/admin/prog/short_curdir ]; then
-      . "$HOME"/admin/prog/short_curdir
+         -r "$HOME"/admin/prog/bash_prompt ]; then
+      . "$HOME"/admin/prog/bash_prompt
    fi
 
+   PS1="\`cgmem_which_prompt\`$OPS1$SHLVL "
+
    #if type -p pip >/dev/null 2>&1; then
    #   eval "`pip completion --bash`"
    #   rm -rf /tmp/pip_build_"$USER"
@@ -342,9 +343,9 @@ mc() {
    if test -n "$BASH_VERSION"; then
       MC_SAVE_OPS1="$OPS1"
       if [ "`type -t short_curdir`" = function ]; then
-         OPS1="\u@\h \`short_curdir\` \\$"
+         OPS1="\u@\${HOSTNAME::5}:\`short_curdir\` \\$"
       else
-         OPS1="\u@\h \W \\$"
+         OPS1="\u@\h:\W \\$"
       fi
    fi