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

Call __git_ps1 as function instead of command substitution

Browse source 
This results in a slightly faster prompt because it saves us one fork()
call for the subshell that now doesn't have to be instantiated.
This commit is contained in:
Fernando Schauenburg 2019-11-08 10:44:59 +01:00
parent 7243dc02b3
commit a9e50f2ba8
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dotfiles/.config/bash/profile
View file

@ -128,7 +128,7 @@ PROMPT_COMMAND=__ps1_set
PS2="... " PS2="... "
__ps1_set() { __ps1_set() {
local exit=$? prompt_char prompt host_color sep local exit=$? prompt_char prompt host_color sep pre post
prompt_char=">>>>>>>>>>" prompt_char=">>>>>>>>>>"
host_color=$PS1_DEFAULT host_color=$PS1_DEFAULT
@ -137,13 +137,20 @@ __ps1_set() {
prompt="${prompt_char:0:$SHLVL}" prompt="${prompt_char:0:$SHLVL}"
sep="$PS1_SEP_COLOR$PS1_SEP$PS1_RST" sep="$PS1_SEP_COLOR$PS1_SEP$PS1_RST"
PS1="\n" pre="\n"
[ $exit -ne 0 ] && PS1+="$PS1_EXIT$exit$PS1_RST$sep" [ $exit -ne 0 ] && pre+="$PS1_EXIT$exit$PS1_RST$sep"
PS1+="$host_color\h$PS1_RST$sep$PS1_PWD\w$PS1_RST" pre+="$host_color\h$PS1_RST$sep$PS1_PWD\w$PS1_RST"
PS1+=$(__git_ps1 "$sep$PS1_GIT%s$PS1_RST")
[ -n "$VIRTUAL_ENV" ] && PS1+="$sep$PS1_VENV${VIRTUAL_ENV##*/}$PS1_RST" post=""
[ "$(jobs | wc -l)" -gt 0 ] && PS1+="$sep${PS1_JOBS}bg: \j$PS1_RST" [ -n "$VIRTUAL_ENV" ] && post+="$sep$PS1_VENV${VIRTUAL_ENV##*/}$PS1_RST"
PS1+="\n$prompt " [ "$(jobs | wc -l)" -gt 0 ] && post+="$sep${PS1_JOBS}bg: \j$PS1_RST"
post+="\n$prompt "
if type __git_ps1 &>/dev/null; then
__git_ps1 "$pre" "$post" "$sep$PS1_GIT%s$PS1_RST" # __git_ps1 sets PS1
else
PS1="$pre$post" # prompt without git info
fi
} }
############################################################################## ##############################################################################