X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Flaunch_feisty_meow.sh;h=8b07cc3b04997a0f70309488d4e54b7f68eabfc4;hb=f5d845d81352418af0785b85412a35888c82486f;hp=9bbcec146ac265972b2ef78acd169b6d7512e29c;hpb=22bbd7c6d7bbb09a5ba955d30ceebf93693d23fb;p=feisty_meow.git

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index 9bbcec14..8b07cc3b 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -10,11 +10,23 @@
 
 ##############
 
-# SHELL_DEBUG: if this variable is non-empty, then it causes the feisty meow
+# DEBUG_FEISTY_MEOW: if this variable is non-empty, then it causes the feisty meow
 # scripts to print more diagnostic information when they run.  not all
 # scripts support this, but the core ones do.
 
-#export SHELL_DEBUG=true
+#export DEBUG_FEISTY_MEOW=true
+
+##############
+
+# some preconditions we want to establish before loading anything...
+
+# make sure that aliases can be used in non-interactive shells.
+shopt -s expand_aliases
+
+# patch the user variable if we were launched by one of our cron jobs.
+if [ -z "$USER" -a ! -z "$CRONUSER" ]; then
+  export USER="$CRONUSER"
+fi
 
 ##############
 
@@ -33,94 +45,100 @@ if [ -z "$FEISTY_MEOW_LOADING_DOCK" ]; then
   FEISTY_MEOW_VARIABLES_LOADING_FILE="$FEISTY_MEOW_LOADING_DOCK/fmc_variables.sh"
   if [ ! -f "$FEISTY_MEOW_VARIABLES_LOADING_FILE" ]; then
     echo -e '\n\n'
-    echo "Feisty meow scripts need initialization via the bootstrap process, e.g.:"
-    echo "  bash $HOME/feisty_meow/scripts/core/reconfigure_feisty_meow.sh"
-    echo -e '\n\n'
+    example_dir="/usr/local/fred"
+    echo -e "\
+The feisty meow scripts need initialization via the bootstrap process.  For\n\
+example, if the feisty meow folder lives in '$example_dir', then this\n\
+command bootstraps feisty meow:\n\
+\n\
+  bash $example_dir/feisty_meow/scripts/core/reconfigure_feisty_meow.sh\n\
+\n\
+\n"
     ERROR_OCCURRED=true
   fi
 
   ##############
 
-  # pull in our generated variables that are the minimal set we need to find
-  # the rest of our resources.
-  source "$FEISTY_MEOW_VARIABLES_LOADING_FILE"
+  if [ -z "$ERROR_OCCURRED" ]; then
+
+    # pull in our generated variables that are the minimal set we need to find
+    # the rest of our resources.
+    source "$FEISTY_MEOW_VARIABLES_LOADING_FILE"
 
-  # Set up the temporary directory.
-  source $FEISTY_MEOW_SCRIPTS/core/create_tempdir.sh
+    # Set up the temporary directory.
+    source "$FEISTY_MEOW_SCRIPTS/core/create_tempdir.sh"
+  fi
 
 fi
 
 ##############
 
-# load the larger body of standard feisty meow variables into the environment.
-# we actually want this to always run also; it will decide what variables need
-# to be set again.
-source $FEISTY_MEOW_SCRIPTS/core/variables.sh
+if [ -z "$ERROR_OCCURRED" ]; then
 
-##############
+  # load the larger body of standard feisty meow variables into the environment.
+  # we actually want this to always run also; it will decide what variables need
+  # to be set again.
+  source "$FEISTY_MEOW_SCRIPTS/core/variables.sh"
+
+  ##############
   
-# include helpful functions.  we do this every time rather than making it part
-# of variable initialization, because functions cannot be exported to
-# sub-shells in bash (much like aliases cannot, to our infinite chagrin after
-# having migrated from korn shell...).
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+  # include helpful functions.  we do this every time rather than making it part
+  # of variable initialization, because functions cannot be exported to
+  # sub-shells in bash.
+  source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
   
-##############
-  
-# check hash table before searching path.
-shopt -s checkhash
-# don't check path for sourced files.
-shopt -u sourcepath
-# ignore duplicate lines.
-HISTCONTROL=ignoredups
-# append to the history file.
-shopt -s histappend
-# automatically update window size if needed.
-shopt -s checkwinsize
-
-##############
+  # load some helper methods for the terminal which we'll use below.
+  source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
 
-# make history writes immediate to avoid losing history if bash is zapped.
-echo $PROMPT_COMMAND | grep -q history
-if [ $? -ne 0 ]; then
-  # we only change the prompt command if we think it hasn't already been done.
-  export PROMPT_COMMAND="history -a;$PROMPT_COMMAND"
-fi
+  ##############
+  
+  # check hash table before searching path.
+  shopt -s checkhash
+  # don't check path for sourced files.
+  shopt -u sourcepath
+  # ignore duplicate lines.
+  HISTCONTROL=ignoredups
+  # append to the history file.
+  shopt -s histappend
+  # automatically update window size if needed.
+  shopt -s checkwinsize
 
-##############
+  ##############
 
-if [ -z "$LIGHTWEIGHT_INIT" ]; then
+  # make history writes immediate to avoid losing history if bash is zapped.
+  echo $PROMPT_COMMAND | grep -q history
+  if [ $? -ne 0 ]; then
+    # we only change the prompt command if we think it hasn't already been done.
+    export PROMPT_COMMAND="history -a;$PROMPT_COMMAND"
+  fi
+  
+  ##############
+  
   # perform the bulkier parts of the initialization process.
-
-  if [ ! -z "$SHELL_DEBUG" ]; then echo "heavyweight init begins..."; fi
-
+  
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo "heavyweight init begins..."; fi
+  
   # set up the aliases for the shell, but only if they are not already set.
   type CORE_ALIASES_LOADED &>/dev/null
   if [ $? -ne 0 ]; then
-    if [ ! -z "$SHELL_DEBUG" ]; then
+    if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
       echo "the aliases were missing, now they are being added..."
     fi
     source "$FEISTY_MEOW_LOADING_DOCK/fmc_core_and_custom_aliases.sh"
   fi
+  
+  #echo before the new labelling, terminal titles have:
+  #show_terminal_titles
+  
+  # a minor tickle of the title of the terminal, unless we already have some history.
+  label_terminal_with_info
+  
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo "heavyweight init is done."; fi
+  
+  if [ -z "$ERROR_OCCURRED" ]; then
+    # set a sentinel variable to say we loaded the feisty meow environment.
+    export FEISTY_MEOW_SCRIPTS_LOADED=true
+  fi
 
-## disabled since we don't think is needed any more, and it's just an
-## attack surface if the other users on the host are not trusted.
-#  # allow connections to our x server from the local host.
-#  if [ ! -z "$DISPLAY" ]; then
-#    if [ ! -z "$(echo "$OS_TYPE" | grep -i darwin)" ]; then
-#      if [ ! -z "$SHELL_DEBUG" ]; then echo "Enabling localhost X connections..."; fi
-#      xhost + localhost >/dev/null 2>&1
-#    fi
-#  fi
-
-  # a minor tickle of the title of the terminal, in case there is one.
-  bash $FEISTY_MEOW_SCRIPTS/tty/label_terminal_with_infos.sh
-
-  if [ ! -z "$SHELL_DEBUG" ]; then echo "heavyweight init is done."; fi
-fi
-
-if [ -z "$ERROR_OCCURRED" ]; then
-  # set a sentinel variable to say we loaded the feisty meow environment.
-  export FEISTY_MEOW_SCRIPTS_LOADED=true
-fi
+fi  # no error occurred.