From 88688d02b2c799ed5af5a8441c120576d36ded82 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sun, 24 Jul 2016 03:53:27 -0700
Subject: [PATCH] Revert "Only show greeting on interactive login sessions"

This reverts commit 3d0ea5fe79759d3d310a2fa014ed9e466ca41453.
---
 .../functions/__fish_config_interactive.fish  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index e26e6bc55..e12c27c04 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -303,6 +303,26 @@ function __fish_config_interactive -d "Initializations that should be performed
         set -g fish_pager_color_description yellow
         set -g fish_pager_color_progress cyan
 
+        # Don't allow setting color other than what linux offers (see #2001)
+        functions -e set_color
+        function set_color --shadow-builtin
+            set -l term_colors black red green yellow blue magenta cyan white normal
+            for a in $argv
+                if not contains -- $a $term_colors
+                    switch $a
+                        # Also allow options
+                        case "-*"
+                            continue
+                        case "*"
+                            echo "Color not valid in TERM = linux: $a"
+                            return 1
+                    end
+                end
+            end
+            builtin set_color $argv
+            return $status
+        end
+
         # Set fish_prompt to a VT-friendly version
         # without color or unicode
         function fish_prompt