XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge d7b6cff2c1 into e38696a0ac

pull/2175/merge
Darren Bishop 2023-03-19 02:44:14 -07:00 committed by GitHub
parent e38696a0ac d7b6cff2c1
commit c557d202cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
themes/liquidprompt/liquidprompt.theme.bash
View File

@ -21,7 +21,7 @@ export LP_BATTERY_THRESHOLD=${LP_BATTERY_THRESHOLD:-75}
export LP_LOAD_THRESHOLD=${LP_LOAD_THRESHOLD:-60} export LP_LOAD_THRESHOLD=${LP_LOAD_THRESHOLD:-60}
export LP_TEMP_THRESHOLD=${LP_TEMP_THRESHOLD:-80} export LP_TEMP_THRESHOLD=${LP_TEMP_THRESHOLD:-80}
unset _lp_legacy _lp_escape __lp_escape
source "$targetdir/liquidprompt" source "$targetdir/liquidprompt"
prompt() { true; } prompt() { true; }
export PS2=" ┃ " export PS2=" ┃ "
@ -29,22 +29,37 @@ export LP_PS1_PREFIX="┌─"
export LP_PS1_POSTFIX="\n└▪ " export LP_PS1_POSTFIX="\n└▪ "
export LP_ENABLE_RUNTIME=0 export LP_ENABLE_RUNTIME=0
_lp_legacy()
{
type -t _lp_escape &> /dev/null
}
_lp_legacy && __lp_escape()
{
ret="$(_lp_escape "$@")"
}
_lp_git_branch() _lp_git_branch()
{ {
(( LP_ENABLE_GIT )) || return (( LP_ENABLE_GIT )) || return
\git rev-parse --is-inside-work-tree >/dev/null 2>&1 || return \git rev-parse --is-inside-work-tree >/dev/null 2>&1 || return
local branch local commit branch ret
commit="$(\git rev-parse --short -q HEAD 2>/dev/null)"
# Recent versions of Git support the --short option for symbolic-ref, but # Recent versions of Git support the --short option for symbolic-ref, but
# not 1.7.9 (Ubuntu 12.04) # not 1.7.9 (Ubuntu 12.04)
if branch="$(\git symbolic-ref -q HEAD)"; then if branch="$(\git symbolic-ref -q HEAD)"; then
_lp_escape "$(\git rev-parse --short=5 -q HEAD 2>/dev/null):${branch#refs/heads/}" __lp_escape "$commit:${branch#refs/heads/}"
lp_vcs_branch="$ret"
else else
# In detached head state, use commit instead # In detached head state, use commit instead
# No escape needed # No escape needed
\git rev-parse --short -q HEAD 2>/dev/null lp_vcs_branch="$commit"
fi fi
_lp_legacy && echo $lp_vcs_branch || return 0
} }
_lp_time() { _lp_time() {