removed concept of LIGHTWEIGHT_INIT

[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 fec110793daf8d4ff2b679219129561402658dac..70b1b0cafa0c26654b74526c4259200d2eba0bbe 100644 (file)
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -65,6 +65,9 @@ source $FEISTY_MEOW_SCRIPTS/core/variables.sh
 # having migrated from korn shell...).
 source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
   
+# load some helper methods for the terminal which we'll use below.
+source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
+
 ##############
   
 # check hash table before searching path.
@@ -80,32 +83,35 @@ shopt -s checkwinsize
 
 ##############
 
-if [ -z "$LIGHTWEIGHT_INIT" ]; then
-  # perform the bulkier parts of the initialization process.
+# 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
 
-  if [ ! -z "$SHELL_DEBUG" ]; then echo "heavyweight init begins..."; fi
+##############
 
-  # set up the aliases for the shell, but only if they are not already set.
-  if [ -z "$CORE_ALIASES_LOADED" ]; then
-    if [ ! -z "$SHELL_DEBUG" ]; then
-      echo "the aliases were missing, now they are being added..."
-    fi
-    source "$FEISTY_MEOW_LOADING_DOCK/fmc_core_and_custom_aliases.sh"
-  fi
+# perform the bulkier parts of the initialization process.
 
-  # 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
+if [ ! -z "$SHELL_DEBUG" ]; 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
+    echo "the aliases were missing, now they are being added..."
   fi
+  source "$FEISTY_MEOW_LOADING_DOCK/fmc_core_and_custom_aliases.sh"
+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
+#echo before the new labelling, terminal titles have:
+#show_terminal_titles
 
-  if [ ! -z "$SHELL_DEBUG" ]; then echo "heavyweight init is done."; fi
-fi
+# a minor tickle of the title of the terminal, unless we already have some history.
+label_terminal_with_info
+
+if [ ! -z "$SHELL_DEBUG" ]; then echo "heavyweight init is done."; fi
 
 if [ -z "$ERROR_OCCURRED" ]; then
   # set a sentinel variable to say we loaded the feisty meow environment.