bash: Prepend memory control group to `PS1`

[dotfiles.git] / .profile

diff --git a/.profile b/.profile
index 581885092317f725fe1341be58fd61b99b5da300..89b65dc3c6b58e03234e43ac0dba93c9e830cc65 100644 (file)
--- a/.profile
+++ b/.profile
@@ -192,7 +192,12 @@ if [ -t 0 ] ; then
          ;;
       esac
 
-      OPS1=${OPS1}"${debian_chroot:+($debian_chroot)}\u@\h \W \\$"
+      if [ -r "$HOME"/admin/prog/bash_prompt ]; then
+         . "$HOME"/admin/prog/bash_prompt
+         OPS1=${OPS1}"${debian_chroot:+($debian_chroot)}\u@\${HOSTNAME::5} \`short_curdir\` \\$"
+      else
+         OPS1=${OPS1}"${debian_chroot:+($debian_chroot)}\u@\h \W \\$"
+      fi
       . "$ENV"
 
    else
@@ -303,17 +308,3 @@ fi
 #
 #    fi
 # fi
-
-# If not running interactively, don't do anything
-case $- in
-    *i*) ;;
-      *) return ;;
-esac
-
-# Stop if non-interactive shell
-[ -z "$PS1" ] && return
-
-if [ -n "$SSH_CONNECTION" -a -z "$STY" -a -t 0 -a -x /usr/bin/screen ]
-then
-   exec /usr/bin/screen -xRR -S default
-fi