Refactor(.shellrc): Remove `$OPS1`, only use `$PS1`

diff --git a/.shellrc b/.shellrc
index 62da7b79080928d80ddefddea6636d4f8b243fb4..12688b78531edd6eadc21fcd71de5dcfe5909f03 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -50,12 +50,10 @@ if test -n "$BASH_VERSION"; then
       set_prompts
       unset set_prompts
    else
-      OPS1="${debian_chroot:+($debian_chroot)}\u@\h:\W \$SHLVL\\$ "
+      PS1="${debian_chroot:+($debian_chroot)}\u@\h:\W \$SHLVL\\$ "
    fi
 fi
 
-PS1="$OPS1"
-
 # clear screen and history, logout
 chlo() { clear; cd; >$HISTFILE; unset HISTFILE; history -c; logout || exit; }
 

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index f18379d852899f3ae2ef512bf739a230bee5608c..57ccf72b8d2a740e7c597d0d5566e1ec806559fd 100644 (file)
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -102,39 +102,39 @@ prompt_git() {
 #fi
 
 set_prompts() {
-      OPS1=''
+      PS1=''
       local _COMMON_PROMPT='${debian_chroot:+($debian_chroot)}\u@\h:\w'
       # display the user, host and current working directory
       # in the terminal title
       case "$TERM" in
          *rxvt*|screen*|*term*|vt100)
-            OPS1="\[\033]0;${_COMMON_PROMPT}\007\]" # Set xterm title/icon
+            PS1="\[\033]0;${_COMMON_PROMPT}\007\]" # Set xterm title/icon
             case "$TERM" in
                screen*)
-                  OPS1="\[\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
-                     OPS1+="\[\033k${_COMMON_PROMPT}\033\\\\\]" # Set screen/tmux caption
+                     PS1+="\[\033k${_COMMON_PROMPT}\033\\\\\]" # Set screen/tmux caption
                   fi
                ;;
             esac
          ;;
 
          *)
-            OPS1=""
+            PS1=""
          ;;
       esac
 
-   OPS1+='${debian_chroot:+($debian_chroot)}'
-   OPS1+='`cgmem_which_prompt`\u@${HOSTNAME::5}:`short_curdir`'
+   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
       #if [ "`type -t __git_ps1`" = function ]; then
-      #   OPS1+='$(__git_ps1)'
+      #   PS1+='$(__git_ps1)'
       #else
-         OPS1+='$(prompt_git)'
+         PS1+='$(prompt_git)'
       #fi
    fi
    # This is for .screenrc: shelltitle "\$ |$SHELL"
-   #OPS1+='\[\033k\033\\\]'
-   OPS1+=' $SHLVL\$ '
-   export OPS1
+   #PS1+='\[\033k\033\\\]'
+   PS1+=' $SHLVL\$ '
+   export PS1
 }