psi-jack/zimfw
1
0
Fork 0
mirror of synced 2024-06-25 18:01:09 -04:00
Code Issues Releases Wiki Activity

Fix gitster theme errors when git-info not enabled

Browse source 
and add a comment stating that the theme requires the `git-info` module.

Closes #145, fixes #144
This commit is contained in:
Eric Nielsen 2017-03-02 08:50:07 -05:00 committed by Matt Hamilton
parent 597d611d7b
commit 176d2ab4d3
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/prompt/themes/gitster.zsh-theme
View file

@ -2,19 +2,24 @@
# Gitster theme # Gitster theme
# https://github.com/shashankmehta/dotfiles/blob/master/thesetup/zsh/.oh-my-zsh/custom/themes/gitster.zsh-theme # https://github.com/shashankmehta/dotfiles/blob/master/thesetup/zsh/.oh-my-zsh/custom/themes/gitster.zsh-theme
# #
# Requires the `git-info` zmodule to be included in the .zimrc file.
prompt_gitster_get_status() { prompt_gitster_status() {
print '%(?:%F{green}➜:%F{red}➜) ' print -n '%(?:%F{green}➜:%F{red}➜) '
} }
prompt_gitster_get_pwd() { prompt_gitster_pwd() {
prompt_short_dir=$(short_pwd) prompt_short_dir=$(short_pwd)
git_root=$(command git rev-parse --show-toplevel 2> /dev/null) && prompt_short_dir=${prompt_short_dir#${$(short_pwd $git_root):h}/} git_root=$(command git rev-parse --show-toplevel 2> /dev/null) && prompt_short_dir=${prompt_short_dir#${$(short_pwd $git_root):h}/}
print ${prompt_short_dir} print -n "%F{white}${prompt_short_dir}"
}
prompt_gitster_git() {
[[ -n ${git_info} ]] && print -n "${(e)git_info[prompt]}"
} }
prompt_gitster_precmd() { prompt_gitster_precmd() {
[[ ${+functions[git-info]} ]] && git-info (( ${+functions[git-info]} )) && git-info
} }
prompt_gitster_setup() { prompt_gitster_setup() {
@ -32,7 +37,7 @@ prompt_gitster_setup() {
zstyle ':zim:git-info:keys' format \ zstyle ':zim:git-info:keys' format \
'prompt' ' %F{cyan}%b%c %C%D' 'prompt' ' %F{cyan}%b%c %C%D'
PROMPT='$(prompt_gitster_get_status)%F{white}$(prompt_gitster_get_pwd)${(e)git_info[prompt]}%f ' PROMPT='$(prompt_gitster_status)$(prompt_gitster_pwd)$(prompt_gitster_git)%f '
RPROMPT='' RPROMPT=''
} }