From 5eedb0ee9c74e46f4f749f8f5067840996c095b9 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sun, 24 Jul 2016 16:39:43 -0700 Subject: [PATCH] Revert "Only show fish greeting for interactive logins" This reverts commit 3a7a6f16eff4591415898b97f54f9521692f2b45. --- build_tools/style.fish | 2 +- share/functions/__fish_config_interactive.fish | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build_tools/style.fish b/build_tools/style.fish index 1e985640c..e5d7a5c33 100755 --- a/build_tools/style.fish +++ b/build_tools/style.fish @@ -101,7 +101,7 @@ if set -q f_files[1] echo $file rm $file.new 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 end end diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish index ec170b457..fa9065de0 100644 --- a/share/functions/__fish_config_interactive.fish +++ b/share/functions/__fish_config_interactive.fish @@ -110,10 +110,9 @@ function __fish_config_interactive -d "Initializations that should be performed # Print a greeting. # fish_greeting can be a function (preferred) or a variable. # - if status --is-interactivel - and status --is-login + if status --is-interactive and status --is-login if functions -q fish_greeting - fish_greeting + fish_greeting else # 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