github/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-11-04 21:31:19 +08:00
Code Issues Projects Releases Wiki Activity

fix(bureau): quote % in git prompt function and remove global variables

Browse Source
This commit is contained in:
Marc Cornellà 2021-12-27 00:38:58 +01:00
parent 4e777ef9d6
commit 43be5ea321
No known key found for this signature in database
GPG Key ID: 0314585E776A9C1B
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
themes/bureau.zsh-theme
View File

@ -17,13 +17,14 @@ ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[yellow]%}●%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}" ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}"
bureau_git_branch () { bureau_git_branch () {
local ref
ref=$(command git symbolic-ref HEAD 2> /dev/null) || \ ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
ref=$(command git rev-parse --short HEAD 2> /dev/null) || return ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
echo "${ref#refs/heads/}" echo "${ref#refs/heads/}"
} }
bureau_git_status() { bureau_git_status() {
_STATUS="" local _STATUS _INDEX
# check status of files # check status of files
_INDEX=$(command git status --porcelain 2> /dev/null) _INDEX=$(command git status --porcelain 2> /dev/null)
@ -63,18 +64,22 @@ bureau_git_status() {
echo $_STATUS echo $_STATUS
} }
bureau_git_prompt () { bureau_git_prompt() {
local _branch=$(bureau_git_branch) local branch=$(bureau_git_branch)
local _status=$(bureau_git_status) local status=$(bureau_git_status)
local _result="" local info
if [[ "${_branch}x" != "x" ]]; then
_result="$ZSH_THEME_GIT_PROMPT_PREFIX$_branch" if [[ -z "${branch}" ]]; then
if [[ "${_status}x" != "x" ]]; then return
_result="$_result $_status"
fi
_result="$_result$ZSH_THEME_GIT_PROMPT_SUFFIX"
fi fi
echo $_result
info="${branch:gs/%/%%}"
if [[ -n "${status}" ]]; then
info+=" $status"
fi
echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${info}${ZSH_THEME_GIT_PROMPT_SUFFIX}"
} }