cleaning and improvements

[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 a814bc24fb7efcac778e8599a86f058e377934e6..a9db25b406c23e37b5f6275c86f975df640a37c4 100644 (file)
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -46,28 +46,28 @@ directory where it is stored, e.g.:
 
   cd /opt/feistymeow.org/feisty_meow
 
-and run this command (the whole unwieldy thing on multiple lines):
+and run this command (the whole unwieldy multiple line chunk inside the bars):
+
 
 ##############
   exec bash -i 3<<EOF 4<&0 <&3
-    echo -e '\n\n^^^ errors above here indicate potential problems in .bashrc ^^^'
-    export FEISTY_MEOW_APEX=\"\$(pwd)\";
-    export FEISTY_MEOW_SCRIPTS=\$FEISTY_MEOW_APEX/scripts;
-    export FEISTY_MEOW_SHOW_LAUNCH_GREETING=yes
+    echo -e '\n\n^^^ errors above here indicate potential problems in .bashrc ^^^';
+    export FEISTY_MEOW_APEX=\"\$(pwd)\"; export FEISTY_MEOW_SCRIPTS=\$FEISTY_MEOW_APEX/scripts;
+    export FEISTY_MEOW_SHOW_LAUNCH_GREETING=yes;
     /bin/bash \$(pwd)/scripts/core/reconfigure_feisty_meow.sh;
-    source \$(pwd)/scripts/core/launch_feisty_meow.sh;
-    exec 3>&- <&4
+    source \$(pwd)/scripts/core/launch_feisty_meow.sh; exec 3>&- <&4
 EOF
 ##############
 
-Note that this assumes that the .bashrc file could still need editing to fix
-an erroneous FEISTY_MEOW_APEX variable, so we skip it above when bash runs.
-Check \$HOME/.bashrc to see if a change there will fix the problem.
+
+This code snippet assumes that the .bashrc file could still need editing to
+fix an erroneous FEISTY_MEOW_APEX variable, so we skip it above when bash
+runs.  Check \$HOME/.bashrc to see if a change there will fix the problem.
 
 "
 else
   # apex is good, so let's make the scripts good too.
-  if [ ! -d "$FEISTY_MEOW_SCRIPTS" ]; then
+  if [ -z "$FEISTY_MEOW_SCRIPTS" -o ! -d "$FEISTY_MEOW_SCRIPTS" ]; then
     export FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_APEX/scripts"
   fi
   # check again to test our belief system...
@@ -77,11 +77,6 @@ else
   fi
 fi
 
-#; /bin/bash -i --norc --noprofile\" > \$HOME/fm-fix 
-#; exec /bin/bash -i --norc --noprofile -c 'bash \$HOME/fm-fix ; echo hello ; read line'
-#--norc --noprofile 
-#; source \$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh
-
 if [ "$NO_REPAIRS_NEEDED" == "true" ]; then
 
   # we believe it's safe to run through the rest of this script.