X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Flaunch_feisty_meow.sh;h=9bbcec146ac265972b2ef78acd169b6d7512e29c;hb=c6174955bb34c94dd89bc36da8244e3635312e22;hp=5cefe78595d545df572902973749d636445cd00d;hpb=4d7f9a2b66436582743d72baf3071825b910dd23;p=feisty_meow.git

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index 5cefe785..9bbcec14 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -22,19 +22,19 @@ export ERROR_OCCURRED=
   # there have been no errors to start with, at least.  we will set this
   # to non-empty if something bad happens.
 
-if [ -z "$FEISTY_MEOW_GENERATED" ]; then
-  # FEISTY_MEOW_GENERATED is where the generated files are located.
+if [ -z "$FEISTY_MEOW_LOADING_DOCK" ]; then
+  # FEISTY_MEOW_LOADING_DOCK is where the generated files are located.
   # this is our single entry point we can use without knowing any variables
   # yet in the initialization process.
-  export FEISTY_MEOW_GENERATED="$HOME/.zz_auto_gen"
+  export FEISTY_MEOW_LOADING_DOCK="$HOME/.zz_feisty_loading"
 #hmmm: the above is kind of a constant.  that's not so great.
 
   # make sure our main variables are established.
-  GENERATED_FEISTY_MEOW_VARIABLES="$FEISTY_MEOW_GENERATED/fmc_variables.sh"
-  if [ ! -f "$GENERATED_FEISTY_MEOW_VARIABLES" ]; 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/bootstrap_shells.sh"
+    echo "  bash $HOME/feisty_meow/scripts/core/reconfigure_feisty_meow.sh"
     echo -e '\n\n'
     ERROR_OCCURRED=true
   fi
@@ -43,7 +43,7 @@ if [ -z "$FEISTY_MEOW_GENERATED" ]; then
 
   # pull in our generated variables that are the minimal set we need to find
   # the rest of our resources.
-  source "$GENERATED_FEISTY_MEOW_VARIABLES"
+  source "$FEISTY_MEOW_VARIABLES_LOADING_FILE"
 
   # Set up the temporary directory.
   source $FEISTY_MEOW_SCRIPTS/core/create_tempdir.sh
@@ -80,26 +80,38 @@ shopt -s checkwinsize
 
 ##############
 
+# 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 "$LIGHTWEIGHT_INIT" ]; then
   # perform the bulkier parts of the initialization process.
 
   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
+  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_GENERATED/fmc_core_and_custom_aliases.sh"
+    source "$FEISTY_MEOW_LOADING_DOCK/fmc_core_and_custom_aliases.sh"
   fi
 
-  # 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
+## 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