From: Chris Koeritz Date: Sat, 11 Nov 2017 07:08:47 +0000 (-0500) Subject: argh, the crucial fix still not working. X-Git-Tag: 2.140.96^2~5 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=c4834a49e6d157d09d636bcbc80516dd87d62577;p=feisty_meow.git argh, the crucial fix still not working. it was at one point fine, but now has mutated. needs more work. --- diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini index eadc86ed..ef535c64 100644 --- a/production/feisty_meow_config.ini +++ b/production/feisty_meow_config.ini @@ -3,7 +3,7 @@ # specifies the version of the code that is being constructed here. major=2 minor=140 -revision=95 +revision=96 build=420 # specifies the remainder of the version record info. diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh index 26ad78e2..631d78e9 100644 --- a/scripts/core/launch_feisty_meow.sh +++ b/scripts/core/launch_feisty_meow.sh @@ -48,11 +48,17 @@ directory where it is stored, e.g.: and execute this command: - export FEISTY_MEOW_APEX=\"\$(pwd)\"; export FEISTY_MEOW_SCRIPTS=\"\$(pwd)/scripts\"; bash scripts/core/reconfigure_feisty_meow.sh && exec bash -i -c \"source \$(pwd)/core/launch_feisty_meow.sh; bash\" + export FEISTY_MEOW_APEX=\$(pwd); echo \"export FEISTY_MEOW_APEX=\$FEISTY_MEOW_APEX\" \> \$HOME/\$USER.fm-fix ; exec /bin/bash -c 'source \$HOME/\$USER.fm-fix; /bin/bash \$FEISTY_MEOW_APEX/scripts/core/reconfigure_feisty_meow.sh ; source \$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh ; /bin/bash -i --norc --noprofile ' + +Note that this assumes that the .bashrc file could still need editing to fix +an erroneous FEISTY_MEOW_APEX variable, so we skip it when bash runs. Check +\$HOME/.bashrc to see if a change there will fix the above error. " fi +#; 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.