From: Oleg Broytman Date: Mon, 26 Apr 2021 00:10:46 +0000 (+0300) Subject: Refactor(bash_prompt): Put `\[`/`\]` once X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=6fdf2d5bd838f424562a7c85aed46ca6c1347077;p=dotfiles.git Refactor(bash_prompt): Put `\[`/`\]` once --- diff --git a/.profile b/.profile index 711b8d2..cdf0a88 100644 --- 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 57ccf72..7ef5fc9 100644 --- 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 }