From b4a48dd6b781e357fc513b1f6dd668d8933f3660 Mon Sep 17 00:00:00 2001 From: Michael Allen Date: Thu, 17 Sep 2015 11:03:44 +0100 Subject: Switch zsh to use the new render prompt --- prompt.zsh | 9 +-------- radar-base.sh | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/prompt.zsh b/prompt.zsh index 2d31820..c2b175a 100755 --- a/prompt.zsh +++ b/prompt.zsh @@ -8,12 +8,5 @@ if is_repo; then autoload colors && colors prepare_zsh_colors - printf '%s' "%{$fg_bold[black]%} git:(%{$reset_color%}" - if show_remote_status $args; then - color_remote_commits - fi - readable_branch_name - color_local_commits - printf '%s' "%{$fg_bold[black]%})%{$reset_color%}" - color_changes_status + render_prompt fi diff --git a/radar-base.sh b/radar-base.sh index 9e233ea..8a7faaf 100755 --- a/radar-base.sh +++ b/radar-base.sh @@ -65,7 +65,7 @@ prepare_zsh_colors() { COLOR_BRANCH="%{${GIT_RADAR_COLOR_BRANCH:-$reset_color}%}" MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"%{$reset_color%}$italic_m%{$reset_color%}"}" - PROMPT_FORMAT="${GIT_RADAR_FORMAT:-""}" + PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" $fg_bold[grey]git:($reset_color%{remote}%{branch}%{local}$fg_bold[grey])$reset_color%{changes}"}" RESET_COLOR_LOCAL="%{${GIT_RADAR_COLOR_LOCAL_RESET:-$reset_color}%}" RESET_COLOR_REMOTE="%{${GIT_RADAR_COLOR_REMOTE_RESET:-$reset_color}%}" -- cgit v1.2.3