Simplify greeting

We have already confirmed we're interactive, and `echo` is a builtin now.
This commit is contained in:
Fabian Homborg 2015-12-29 15:58:48 +01:00
parent bb932a0a0a
commit 834ebef53c

View file

@ -101,24 +101,15 @@ function __fish_config_interactive -d "Initializations that should be performed
eval "$__fish_bin_dir/fish -c 'fish_update_completions > /dev/null ^/dev/null' &" eval "$__fish_bin_dir/fish -c 'fish_update_completions > /dev/null ^/dev/null' &"
end end
if status -i #
# # Print a greeting
# Print a greeting # fish_greeting can be a function (preferred) or a variable
# #
if functions -q fish_greeting if functions -q fish_greeting
fish_greeting fish_greeting
else else
if set -q fish_greeting set -q fish_greeting; and echo $fish_greeting
switch "$fish_greeting"
case ''
# If variable is empty, don't print anything, saves us a fork
case '*'
echo $fish_greeting
end
end
end
end end
# #