From: Oleg Broytman <phd@phdru.name>
Date: Sun, 25 Apr 2021 22:03:45 +0000 (+0300)
Subject: Feat(bash_prompt): Improve `PS1` generation
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=7cd9e77a605d4c413110e410d44efcebae9c4d14;p=dotfiles.git

Feat(bash_prompt): Improve `PS1` generation

Refactor the common part (`_COMMON_PROMPT`).
Use apostrophes instead of double quotes.
---

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index b89d340..02141e3 100644
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -103,15 +103,15 @@ prompt_git() {
 
 set_prompts() {
       OPS1=''
+      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;${debian_chroot:+($debian_chroot)}\u@\h:\w\007\]"
+            OPS1+="\[\033]0;${_COMMON_PROMPT}\007\]"
             case "$TERM" in
                screen*)
-                  OPS1+="\[\033k${debian_chroot:+($debian_chroot)}"
-                  OPS1+="\u@\h:\w\033\\\\\]" # Set screen/tmux caption
+                  OPS1+="\[\033k${_COMMON_PROMPT}\033\\\\\]" # Set screen/tmux caption
                ;;
             esac
          ;;
@@ -121,17 +121,17 @@ set_prompts() {
          ;;
       esac
 
-   OPS1+="${debian_chroot:+($debian_chroot)}"
-   OPS1+="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\`"
+   OPS1+='${debian_chroot:+($debian_chroot)}'
+   OPS1+='`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)"
+      #   OPS1+='$(__git_ps1)'
       #else
-         OPS1+="\$(prompt_git)"
+         OPS1+='$(prompt_git)'
       #fi
    fi
    # This is for .screenrc: shelltitle "\$ |$SHELL"
-   #OPS1+="\[\033k\033\\\\\]"
-   OPS1+=" \$SHLVL\\$ "
+   #OPS1+='\[\033k\033\\\]'
+   OPS1+=' $SHLVL\$ '
    export OPS1
 }