Refactor(bash_prompt): Put `\[`/`\]` once

diff --git a/.profile b/.profile
index 711b8d235126dfd0dbd8bca616404b21cadf5b6e..cdf0a88a00af9c067d1582377ebd0d8c6b31f32c 100644 (file)
--- a/.profile
+++ b/.profile
@@ -172,7 +172,7 @@ if [ -t 0 ] ; then
    if test -n "$BASH_VERSION"; then
       . "$HOME/.bashrc"
    else
-      OPS1="${debian_chroot:+($debian_chroot)}`/usr/bin/whoami`@`/bin/hostname -s` > "
+      PS1="${debian_chroot:+($debian_chroot)}`/usr/bin/whoami`@`/bin/hostname -s` > "
    fi
 
    ### biff controls new mail notification

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index 57ccf72b8d2a740e7c597d0d5566e1ec806559fd..7ef5fc970ab4c8a57be04698859ab597b63368a4 100644 (file)
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -108,12 +108,12 @@ set_prompts() {
       # in the terminal title
       case "$TERM" in
          *rxvt*|screen*|*term*|vt100)
-            PS1="\[\033]0;${_COMMON_PROMPT}\007\]" # Set xterm title/icon
+            PS1="\033]0;${_COMMON_PROMPT}\007" # Set xterm title/icon
             case "$TERM" in
                screen*)
-                  PS1="\[\033P\033]0;${_COMMON_PROMPT}\007\033\\\\\]" # Set xterm title/icon under screen/tmux
+                  PS1="\033P\033]0;${_COMMON_PROMPT}\007\033\\\\" # Set xterm title/icon under screen/tmux
                   if [ -z "$MC_SID" ]; then
-                     PS1+="\[\033k${_COMMON_PROMPT}\033\\\\\]" # Set screen/tmux caption
+                     PS1+="\033k${_COMMON_PROMPT}\033\\\\" # Set screen/tmux caption
                   fi
                ;;
             esac
@@ -124,6 +124,10 @@ set_prompts() {
          ;;
       esac
 
+   # This is for .screenrc: shelltitle "\$ |$SHELL"
+   #PS1+='\033k\033\\'
+
+   PS1="\[$PS1\]"
    PS1+='${debian_chroot:+($debian_chroot)}'
    PS1+='`cgmem_which_prompt`\u@${HOSTNAME::5}:`short_curdir`'
    if test -x /usr/bin/git >/dev/null 2>&1; then
@@ -133,8 +137,5 @@ set_prompts() {
          PS1+='$(prompt_git)'
       #fi
    fi
-   # This is for .screenrc: shelltitle "\$ |$SHELL"
-   #PS1+='\[\033k\033\\\]'
    PS1+=' $SHLVL\$ '
-   export PS1
 }