X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Flaunch_feisty_meow.sh;h=4a6184e687571f4a8c8404eaa09dd0e334eaa2b1;hb=12d3b0a9a2dae8d187318c52465fd262c74b0c85;hp=7e8ca62d9d7b92e01570b57c9e9bec2c833986a7;hpb=2bab10a2a479e75e3edef2cc238b4149449732ba;p=feisty_meow.git

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index 7e8ca62d..4a6184e6 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -19,7 +19,7 @@
 ##############
 
 # this script cannot handle figuring out where it lives, so approaches that
-# get the WORKDIR will fail.  this is a consequence of this always being used
+# get the THISDIR will fail.  this is a consequence of this always being used
 # in bash's 'source' directive, which does not pass the script name as
 # argument 0.  instead, we just check for the bad condition of a malconfigured
 # script system and try to repair it.
@@ -92,6 +92,13 @@ if [ "$NO_REPAIRS_NEEDED" == "true" ]; then
   if [ -z "$USER" -a ! -z "$CRONUSER" ]; then
     export USER="$CRONUSER"
   fi
+
+  # use the xauth info if we were given one in the environment.
+  # this allows root or other su'd identities to create windows with same
+  # display variable.
+  if [ ! -z "$DISPLAY" -a ! -z "$IMPORTED_XAUTH" ]; then
+    xauth add "$IMPORTED_XAUTH"
+  fi
   
   ##############
   
@@ -215,10 +222,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 +235,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.