X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=bc164f1a305a08561600ff07a98d2340e8a79da8;hb=04bbc0256453a304c73e24035fefb995c158953a;hp=541417a422ae2ff1c5040e1e58c70f74b8867034;hpb=7ae7c0c571d5d950e4f6a349130a8f3401e09ea1;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index 541417a..bc164f1 100644
--- 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,7 +57,6 @@ case "$HOME" in
    ;;
 esac
 
-
 if test -n "$BASH_VERSION"; then
    [ "`type -t ls`" = alias ] && unalias ls
    [ "`type -t ll`" = alias ] && unalias ll
@@ -153,8 +150,8 @@ 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
 
    #if type -p pip >/dev/null 2>&1; then
@@ -183,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; }
@@ -342,9 +340,10 @@ mc() {
    if test -n "$BASH_VERSION"; then
       MC_SAVE_OPS1="$OPS1"
       if [ "`type -t short_curdir`" = function ]; then
-         OPS1="\u@\h \`short_curdir\` \\$"
+         OPS1="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\` "
+         OPS1+="\$(prompt_git)\\$\$SHLVL "
       else
-         OPS1="\u@\h \W \\$"
+         OPS1="\u@\h:\W \\$"
       fi
    fi