X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Flaunch_feisty_meow.sh;h=3c3cd6915f098be702ae41febb16e0daa65e5536;hb=3f6dd0ea77b0c6d86e25f3cb65e54f08737d21c7;hp=65a579a5f6a04f5e30c602c55689600536d5f662;hpb=974cb458e356b918d426db0f9f0a2dcbebcd7034;p=feisty_meow.git diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh index 65a579a5..3c3cd691 100644 --- a/scripts/core/launch_feisty_meow.sh +++ b/scripts/core/launch_feisty_meow.sh @@ -18,8 +18,6 @@ ############## -echo "yodel; feisty apex=$FEISTY_MEOW_APEX; feisty scripts=$FEISTY_MEOW_SCRIPTS" - # this script cannot handle figuring out where it lives, so approaches that # get the WORKDIR will fail. this is a consequence of this always being used # in bash's 'source' directive, which does not pass the script name as @@ -48,27 +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): + -echo pwd outside \$(pwd\) ; +############## exec bash -i 3<&- <&4 + 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 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... @@ -78,16 +77,8 @@ 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; read line ;read line' -#--norc --noprofile -#; source \$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh - if [ "$NO_REPAIRS_NEEDED" == "true" ]; then -echo GOT TO NO REPAIRS PLACE -read line - # we believe it's safe to run through the rest of this script. ############## @@ -197,7 +188,9 @@ read line if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo "the aliases were missing, now they are being added..." fi +echo HEEE HAHAHAHAHA source "$FEISTY_MEOW_LOADING_DOCK/fmc_core_and_custom_aliases.sh" +echo HOOOOEY fi #echo before the new labelling, terminal titles have: @@ -215,9 +208,15 @@ read line fi # no error occurred. -else -echo SOME REPAIRS WERE NEEED -read line + if [ ! -z "$FEISTY_MEOW_SHOW_LAUNCH_GREETING" ]; then + echo + echo + echo "welcome to the feisty meow zone of peace, one of many refuges in the uncountably" + echo "infinite multiverses that are hypothetically possible." + echo + echo + unset FEISTY_MEOW_SHOW_LAUNCH_GREETING + fi fi # "$NO_REPAIRS_NEEDED" was == "true"