Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

prompts: guard against missing fish_is_root_user

Browse source 
Prevents error spew when running one of these prompt on fish 3.1.2.
This commit is contained in:
Johannes Altmanninger 2020-09-05 09:02:32 +02:00
parent 4331face4a
commit 89724f9366
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
share/functions/fish_prompt.fish
View file

@ -9,7 +9,7 @@ function fish_prompt --description 'Write out the prompt'
# Color the prompt differently when we're root # Color the prompt differently when we're root
set -l color_cwd $fish_color_cwd set -l color_cwd $fish_color_cwd
set -l suffix '>' set -l suffix '>'
if fish_is_root_user if functions -q fish_is_root_user; and fish_is_root_user
if set -q fish_color_cwd_root if set -q fish_color_cwd_root
set color_cwd $fish_color_cwd_root set color_cwd $fish_color_cwd_root
end end

2
share/tools/web_config/sample_prompts/classic.fish
View file

@ -3,7 +3,7 @@ function fish_prompt --description "Write out the prompt"
set -l color_cwd set -l color_cwd
set -l suffix set -l suffix
if fish_is_root_user if functions -q fish_is_root_user; and fish_is_root_user
if set -q fish_color_cwd_root if set -q fish_color_cwd_root
set color_cwd $fish_color_cwd_root set color_cwd $fish_color_cwd_root
else else

2
share/tools/web_config/sample_prompts/classic_status.fish
View file

@ -9,7 +9,7 @@ function fish_prompt --description "Write out the prompt"
set -l color_cwd set -l color_cwd
set -l suffix set -l suffix
if fish_is_root_user if functions -q fish_is_root_user; and fish_is_root_user
if set -q fish_color_cwd_root if set -q fish_color_cwd_root
set color_cwd $fish_color_cwd_root set color_cwd $fish_color_cwd_root
else else

2
share/tools/web_config/sample_prompts/classic_vcs.fish
View file

@ -9,7 +9,7 @@ function fish_prompt --description 'Write out the prompt'
# Color the prompt differently when we're root # Color the prompt differently when we're root
set -l color_cwd $fish_color_cwd set -l color_cwd $fish_color_cwd
set -l suffix '>' set -l suffix '>'
if fish_is_root_user if functions -q fish_is_root_user; and fish_is_root_user
if set -q fish_color_cwd_root if set -q fish_color_cwd_root
set color_cwd $fish_color_cwd_root set color_cwd $fish_color_cwd_root
end end

2
share/tools/web_config/sample_prompts/debian_chroot.fish
View file

@ -21,7 +21,7 @@ function fish_prompt --description 'Write out the prompt, prepending the Debian
echo -n -s (set_color yellow) "$__fish_debian_chroot_prompt" (set_color normal) ' ' echo -n -s (set_color yellow) "$__fish_debian_chroot_prompt" (set_color normal) ' '
end end
if fish_is_root_user if functions -q fish_is_root_user; and fish_is_root_user
echo -n -s "$USER" @ (prompt_hostname) ' ' (set -q fish_color_cwd_root echo -n -s "$USER" @ (prompt_hostname) ' ' (set -q fish_color_cwd_root
and set_color $fish_color_cwd_root and set_color $fish_color_cwd_root
or set_color $fish_color_cwd) (prompt_pwd) \ or set_color $fish_color_cwd) (prompt_pwd) \

2
share/tools/web_config/sample_prompts/informative.fish
View file

@ -6,7 +6,7 @@ function fish_prompt --description 'Informative prompt'
set -l last_pipestatus $pipestatus set -l last_pipestatus $pipestatus
set -l last_status $status set -l last_status $status
if fish_is_root_user if functions -q fish_is_root_user; and fish_is_root_user
printf '%s@%s %s%s%s# ' $USER (prompt_hostname) (set -q fish_color_cwd_root printf '%s@%s %s%s%s# ' $USER (prompt_hostname) (set -q fish_color_cwd_root
and set_color $fish_color_cwd_root and set_color $fish_color_cwd_root
or set_color $fish_color_cwd) \ or set_color $fish_color_cwd) \

2
share/tools/web_config/sample_prompts/informative_vcs.fish
View file

@ -59,7 +59,7 @@ function fish_prompt --description 'Write out the prompt'
set -l color_cwd set -l color_cwd
set -l suffix set -l suffix
if fish_is_root_user if functions -q fish_is_root_user; and fish_is_root_user
if set -q fish_color_cwd_root if set -q fish_color_cwd_root
set color_cwd $fish_color_cwd_root set color_cwd $fish_color_cwd_root
else else

2
share/tools/web_config/sample_prompts/nim.fish
View file

@ -54,7 +54,7 @@ function fish_prompt
set_color -o green set_color -o green
echo -n [ echo -n [
if fish_is_root_user if functions -q fish_is_root_user; and fish_is_root_user
set_color -o red set_color -o red
else else
set_color -o yellow set_color -o yellow