Merge branch 'release-2.140.100'

[feisty_meow.git] / scripts / core / launch_feisty_meow.sh

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index 7e8ca62d9d7b92e01570b57c9e9bec2c833986a7..f793c6d9d412d4ed80afc8663f686e7a8dffd090 100644 (file)
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -215,10 +215,11 @@ if [ "$NO_REPAIRS_NEEDED" == "true" ]; then
     unset FEISTY_MEOW_SHOW_LAUNCH_GREETING
   fi
 
-  # only run this hello file if the core aliases haven't been loaded already.  this
+  # only run this hello file if the core feisty meow support haven't been loaded already.  this
   # hopefully guarantees we show the info at most once in one shell continuum.
-  type CORE_ALIASES_LOADED &>/dev/null
-  if [ $? -ne 0 ]; then
+  # this can also be disabled if the NO_HELLO variable has a non-empty value.
+  type CORE_VARIABLES_LOADED &>/dev/null
+  if [ $? -ne 0 -a -z "$NO_HELLO" ]; then
     # print out a personalized hello file if we find one.
     if [ -f ~/hello.txt ]; then
       echo
@@ -227,6 +228,8 @@ if [ "$NO_REPAIRS_NEEDED" == "true" ]; then
       sep 28
       echo
     fi
+    # from now on there should be no extra helloing.
+    export NO_HELLO=true
   fi
 
   # load the last bits we do here.