Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 13:39:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only show fish greeting for interactive logins

Browse source 
This is a regression introduced by 834ebef53c
Bolster with a check for only login sessions too -- hopefully makes it
less annooying on subshells in general.

Fixes #3261
This commit is contained in:
Aaron Gyes 2016-07-24 00:05:05 -07:00
parent 3d0ea5fe79
commit 3a7a6f16ef
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build_tools/style.fish
View file

@ -101,7 +101,7 @@ if set -q f_files[1]
echo $file echo $file
rm $file.new rm $file.new
else else
echo (set_color --underline)$file(set_color normal)is being reformatted echo (set_color --underline)$file(set_color normal) is being reformatted
mv $file.new $file mv $file.new $file
end end
end end

5
share/functions/__fish_config_interactive.fish
View file

@ -110,9 +110,10 @@ function __fish_config_interactive -d "Initializations that should be performed
# Print a greeting. # Print a greeting.
# fish_greeting can be a function (preferred) or a variable. # fish_greeting can be a function (preferred) or a variable.
# #
if status --is-interactive and status --is-login if status --is-interactivel
and status --is-login
if functions -q fish_greeting if functions -q fish_greeting
fish_greeting fish_greeting
else else
# The greeting used to be skipped when fish_greeting was empty (not just undefined) # The greeting used to be skipped when fish_greeting was empty (not just undefined)
# Keep it that way to not print superfluous newlines on old configuration # Keep it that way to not print superfluous newlines on old configuration