h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-21 19:41:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

fish_prompt: Don't do work outside of the function

Browse Source 
That just makes it annoying to use `funced`.

Also sync the classic_vcs prompt again.
This commit is contained in:
Fabian Homborg
2020-08-27 17:02:58 +02:00
parent d00e0ee64b
commit f88c3389da
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
share/functions/fish_prompt.fish
View File

@@ -1,8 +1,6 @@
# name: Classic + Vcs
# name: Classic + Vcs (the default)
# author: Lily Ballard
set __fish_prompt_status_generation $status_generation
function fish_prompt --description 'Write out the prompt'
set -l last_pipestatus $pipestatus
set -l last_status $status
@@ -25,7 +23,9 @@ function fish_prompt --description 'Write out the prompt'
end
# Write pipestatus
# If the status was carried over (e.g. after `set`), don't bold it.
set -l bold_flag --bold
set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation
if test $__fish_prompt_status_generation = $status_generation
set bold_flag
end

9
share/tools/web_config/sample_prompts/classic_vcs.fish
View File

@@ -23,7 +23,14 @@ function fish_prompt --description 'Write out the prompt'
end
# Write pipestatus
set -l prompt_status (__fish_print_pipestatus $last_status " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus)
# If the status was carried over (e.g. after `set`), don't bold it.
set -l bold_flag --bold
set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation
if test $__fish_prompt_status_generation = $status_generation
set bold_flag
end
set __fish_prompt_status_generation $status_generation
set -l prompt_status (__fish_print_pipestatus $last_status " [" "]" "|" (set_color $fish_color_status) (set_color $bold_flag $fish_color_status) $last_pipestatus)
echo -n -s (set_color $fish_color_user) "$USER" $normal @ (set_color $color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal $prompt_status $suffix " "
end