bash: Prepend memory control group to `PS1`

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index 6cb771f2d0824c3f32514a33b3bbdaf8bd2ba7fa..56051caf9037a6da929c2c19f94619e117e0aeee 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
@@ -153,10 +151,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"