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

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index 8f0a3a48..9bbcec14 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -34,7 +34,7 @@ if [ -z "$FEISTY_MEOW_LOADING_DOCK" ]; then
   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
@@ -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_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