From 2565c5c15b276de561053e7a20596f613a2d63bd Mon Sep 17 00:00:00 2001 From: David Bishop Date: Wed, 26 Apr 2017 12:12:42 -0600 Subject: [PATCH] Use $suffix in classic_vcs prompt instead of hardcoding to '>' Also, ensure that suffix is local in both classic_vcs.fish and informative_vcs.fish. Fixes #3991 --- share/tools/web_config/sample_prompts/classic_vcs.fish | 3 ++- share/tools/web_config/sample_prompts/informative_vcs.fish | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/share/tools/web_config/sample_prompts/classic_vcs.fish b/share/tools/web_config/sample_prompts/classic_vcs.fish index beac87a8b..9635bb74c 100644 --- a/share/tools/web_config/sample_prompts/classic_vcs.fish +++ b/share/tools/web_config/sample_prompts/classic_vcs.fish @@ -48,6 +48,7 @@ function fish_prompt --description 'Write out the prompt' set -l color_cwd set -l prefix + set -l suffix switch $USER case root toor if set -q fish_color_cwd_root @@ -66,5 +67,5 @@ function fish_prompt --description 'Write out the prompt' set prompt_status ' ' (set_color $fish_color_status) "[$last_status]" "$normal" end - echo -n -s (set_color $fish_color_user) "$USER" $normal @ (set_color $fish_color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (__fish_vcs_prompt) $normal $prompt_status "> " + echo -n -s (set_color $fish_color_user) "$USER" $normal @ (set_color $fish_color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (__fish_vcs_prompt) $normal $prompt_status $suffix " " end diff --git a/share/tools/web_config/sample_prompts/informative_vcs.fish b/share/tools/web_config/sample_prompts/informative_vcs.fish index f8d01faf8..d7419a495 100644 --- a/share/tools/web_config/sample_prompts/informative_vcs.fish +++ b/share/tools/web_config/sample_prompts/informative_vcs.fish @@ -67,6 +67,7 @@ function fish_prompt --description 'Write out the prompt' set -l color_cwd set -l prefix + set -l suffix switch $USER case root toor if set -q fish_color_cwd_root