From cef0b848b43b71172850cd503586332be797ca82 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Sun, 12 Nov 2017 00:17:21 -0500 Subject: [PATCH] cleaning and improvements --- infobase/configuration/cron/aa_cron_defaults.crontab | 1 - infobase/feisty_inits/dot.bashrc-normal-user | 4 +--- infobase/feisty_inits/dot.bashrc-root | 4 +--- scripts/core/launch_feisty_meow.sh | 7 +------ 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/infobase/configuration/cron/aa_cron_defaults.crontab b/infobase/configuration/cron/aa_cron_defaults.crontab index 51a73ff4..c8ff3ebe 100644 --- a/infobase/configuration/cron/aa_cron_defaults.crontab +++ b/infobase/configuration/cron/aa_cron_defaults.crontab @@ -23,7 +23,6 @@ SHELL=/bin/bash # almost nothing from the user's environment. this folder needs to be updated # for your own particular install location. FEISTY_MEOW_APEX=/opt/feistymeow.org/feisty_meow -#FEISTY_MEOW_APEX=$HOME/feisty_meow # crontab miniature docs: # diff --git a/infobase/feisty_inits/dot.bashrc-normal-user b/infobase/feisty_inits/dot.bashrc-normal-user index edc83b70..615970aa 100644 --- a/infobase/feisty_inits/dot.bashrc-normal-user +++ b/infobase/feisty_inits/dot.bashrc-normal-user @@ -19,10 +19,8 @@ export HISTFILESIZE=8000000 ############## -# system-wide install: +# system-wide install (will be fixed by connect_feisty_meow script): export FEISTY_MEOW_APEX="/opt/feistymeow.org/feisty_meow" -# personal install: -#export FEISTY_MEOW_APEX="$HOME/feisty_meow" # sets up the feisty_meow scripts if appropriate for the environment. if [ "${TERM}" != "dumb" -a -z "$PBS_ENVIRONMENT" ]; then diff --git a/infobase/feisty_inits/dot.bashrc-root b/infobase/feisty_inits/dot.bashrc-root index 1b1dd1e2..453a0fbd 100644 --- a/infobase/feisty_inits/dot.bashrc-root +++ b/infobase/feisty_inits/dot.bashrc-root @@ -19,10 +19,8 @@ export HISTFILESIZE=8000000 ############## -# system-wide install: +# system-wide install (will be fixed by connect_feisty_meow script): export FEISTY_MEOW_APEX="/opt/feistymeow.org/feisty_meow" -# personal install: -#export FEISTY_MEOW_APEX="$HOME/feisty_meow" # the "fredme" macro enables the feisty_meow environment. alias fredme='source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"' diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh index 241e2a0f..a9db25b4 100644 --- a/scripts/core/launch_feisty_meow.sh +++ b/scripts/core/launch_feisty_meow.sh @@ -67,7 +67,7 @@ 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. -- 2.34.1