From b9d2e4d897a2a4bf471b5019156b73f5916665cc Mon Sep 17 00:00:00 2001 From: Kurtis Rader Date: Thu, 20 Apr 2017 20:17:50 -0700 Subject: [PATCH] fix fish greeting regression Fixes #3973 --- share/functions/__fish_config_interactive.fish | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish index 6aac34907..65027b1d2 100644 --- a/share/functions/__fish_config_interactive.fish +++ b/share/functions/__fish_config_interactive.fish @@ -23,13 +23,12 @@ function __fish_config_interactive -d "Initializations that should be performed end if not set -q fish_greeting - set -l line1 (printf (_ 'Welcome to fish, the friendly interactive shell' )) + set -l line1 (_ 'Welcome to fish, the friendly interactive shell') + set -l line2 '' if not set -q __fish_init_2_3_0 - set -l line2 \n(printf (_ 'Type %shelp%s for instructions on how to use fish %s') (set_color green) (set_color normal)) - else - set -l line2 '' + set line2 \n(_ 'Type `help` for instructions on how to use fish') end - set -U fish_greeting $line1$line2 + set -U fish_greeting "$line1$line2" end #