mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-02-20 03:02:29 +01:00
Validate if its a git repository or not before triggering git commands.
closes #2883
This commit is contained in:
parent
3913106b2e
commit
90120d1035
1 changed files with 11 additions and 12 deletions
|
|
@ -5,9 +5,10 @@ prompt_setup_pygmalion(){
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
timestamp=$(date +%H:%M)
|
||||||
|
|
||||||
base_prompt='%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}| %{$reset_color%}'
|
base_prompt='%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}| %{$reset_color%}'
|
||||||
post_prompt='%{$fg[cyan]%}⇒%{$reset_color%} '
|
post_prompt='$timestamp %{$fg[cyan]%}⇒%{$reset_color%} '
|
||||||
|
|
||||||
base_prompt_nocolor=$(echo "$base_prompt" | perl -pe "s/%\{[^}]+\}//g")
|
base_prompt_nocolor=$(echo "$base_prompt" | perl -pe "s/%\{[^}]+\}//g")
|
||||||
post_prompt_nocolor=$(echo "$post_prompt" | perl -pe "s/%\{[^}]+\}//g")
|
post_prompt_nocolor=$(echo "$post_prompt" | perl -pe "s/%\{[^}]+\}//g")
|
||||||
|
|
@ -16,19 +17,17 @@ prompt_setup_pygmalion(){
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt_pygmalion_precmd(){
|
prompt_pygmalion_precmd(){
|
||||||
local gitinfo=$(git_prompt_info)
|
|
||||||
local gitinfo_nocolor=$(echo "$gitinfo" | perl -pe "s/%\{[^}]+\}//g")
|
|
||||||
local exp_nocolor="$(print -P \"$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor\")"
|
local exp_nocolor="$(print -P \"$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor\")"
|
||||||
local prompt_length=${#exp_nocolor}
|
local prompt_length=${#exp_nocolor}
|
||||||
|
|
||||||
local nl=" "
|
local nl=" "
|
||||||
|
|
||||||
if [[ $prompt_length -gt 40 ]]; then
|
if [ -d "./.git" ]; then
|
||||||
nl=$'\n%{\r%}';
|
local gitinfo=$(git_prompt_info)
|
||||||
|
local gitinfo_nocolor=$(echo "$gitinfo" | perl -pe "s/%\{[^}]+\}//g")
|
||||||
|
PROMPT="$base_prompt$gitinfo|$nl$post_prompt"
|
||||||
|
else
|
||||||
|
PROMPT="$base_prompt$post_prompt"
|
||||||
fi
|
fi
|
||||||
PROMPT="$base_prompt$gitinfo$nl$post_prompt"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt_setup_pygmalion
|
prompt_setup_pygmalion
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue