From 18a4ae3fd15acd0c7540d2c34a1a71249efdf576 Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Sat, 23 May 2020 18:54:04 +0200 Subject: [PATCH] fish_greeting: Add second line unconditionally For some reason we checked __fish_initialized *after confirming* that $fish_greeting was empty? See #7016. --- share/functions/__fish_config_interactive.fish | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish index dfd6f0f11..2b115ab96 100644 --- a/share/functions/__fish_config_interactive.fish +++ b/share/functions/__fish_config_interactive.fish @@ -21,10 +21,7 @@ function __fish_config_interactive -d "Initializations that should be performed if not set -q fish_greeting set -l line1 (_ 'Welcome to fish, the friendly interactive shell') - set -l line2 '' - if test $__fish_initialized -lt 2300 - set line2 \n(_ 'Type `help` for instructions on how to use fish') - end + set -l line2 \n(_ 'Type `help` for instructions on how to use fish') set -U fish_greeting "$line1$line2" end