fernando/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Refactor bash PROMPT_COMMAND function

Browse source 
Two main changes:
    - avoid 2 additional fork() calls by evaluating \j instead of using
      $(jobs | wc -l) -> one fork for subshell and another for `wc`.
    - make the build up of the prompt a bit more modular by using an
      array to collect the pieces and "sort of" join them in the end.
This commit is contained in:
Fernando Schauenburg 2019-11-08 13:38:28 +01:00
parent a9e50f2ba8
commit a49fe75566
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
dotfiles/.config/bash/profile
View file

@ -128,30 +128,27 @@ PROMPT_COMMAND=__ps1_set
PS2="... " PS2="... "
__ps1_set() { __ps1_set() {
local exit=$? prompt_char prompt host_color sep pre post local exit=$?
local sep="$PS1_SEP_COLOR$PS1_SEP"
prompt_char=">>>>>>>>>>" local host=$PS1_DEFAULT
host_color=$PS1_DEFAULT [ -n "$SSH_CLIENT" ] && host=$PS1_SSH
[ -n "$SSH_CLIENT" ] && host_color=$PS1_SSH [ $EUID -eq 0 ] && host=$PS1_ROOT
[ $EUID -eq 0 ] && { host_color=$PS1_ROOT; prompt_char="!!!!!!!!!!"; }
prompt="${prompt_char:0:$SHLVL}"
sep="$PS1_SEP_COLOR$PS1_SEP$PS1_RST"
pre="\n" local prompt=">>>>>>>>>>"
[ $exit -ne 0 ] && pre+="$PS1_EXIT$exit$PS1_RST$sep" [ $EUID -eq 0 ] && prompt="##########"
pre+="$host_color\h$PS1_RST$sep$PS1_PWD\w$PS1_RST"
post="" local ps=()
[ -n "$VIRTUAL_ENV" ] && post+="$sep$PS1_VENV${VIRTUAL_ENV##*/}$PS1_RST" [ $exit -ne 0 ] && ps+=("$PS1_EXIT$exit")
[ "$(jobs | wc -l)" -gt 0 ] && post+="$sep${PS1_JOBS}bg: \j$PS1_RST" ps+=("$host\h")
post+="\n$prompt " ps+=("$PS1_PWD\w")
type __git_ps1 && __git_ps1 '' '' "$PS1_GIT%s" && [ -n "$PS1" ] && ps+=("$PS1")
[ -n "$VIRTUAL_ENV" ] && ps+=("$PS1_VENV${VIRTUAL_ENV##*/}")
local j="\j" && [ "${j@P}" -gt 0 ] && ps+=("$PS1_JOBS${j@P} bg")
if type __git_ps1 &>/dev/null; then printf -v PS1 "$sep%s" "${ps[@]:1}"
__git_ps1 "$pre" "$post" "$sep$PS1_GIT%s$PS1_RST" # __git_ps1 sets PS1 PS1="\n${ps[0]}$PS1$PS1_RST\n${prompt:0:$SHLVL} "
else } &>/dev/null
PS1="$pre$post" # prompt without git info
fi
}
############################################################################## ##############################################################################
# Customize shell aliases # Customize shell aliases