X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=infobase%2Ffeisty_inits%2Fdot.bashrc-normal-user;h=9c15d01120ecaa85b661bb9186fa9bcd40c4a69c;hb=4e15bc3b03c452086296b0b2e8dab709f34b5957;hp=f64bbcfcf3d5cd178eff7d7468d06f9ab9239e26;hpb=3df024c15c163593486df581e02093fe5d6eb8bd;p=feisty_meow.git diff --git a/infobase/feisty_inits/dot.bashrc-normal-user b/infobase/feisty_inits/dot.bashrc-normal-user index f64bbcfc..9c15d011 100644 --- a/infobase/feisty_inits/dot.bashrc-normal-user +++ b/infobase/feisty_inits/dot.bashrc-normal-user @@ -9,6 +9,9 @@ if [ -f /etc/bash.bashrc ]; then # drag in the default version of this file. this may not be needed if your # .bashrc script already has substantial code or already does this. source /etc/bash.bashrc +elif [ -f /etc/bashrc ]; then + # pull in the mac's version of this file. + source /etc/bashrc fi ############## @@ -26,7 +29,11 @@ export FEISTY_MEOW_APEX="/opt/feistymeow.org/feisty_meow" # sets up the feisty_meow scripts if appropriate for the environment. if [ "${TERM}" != "dumb" -a -z "$PBS_ENVIRONMENT" ]; then - source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh" + if [ -d "$FEISTY_MEOW_APEX" ]; then + source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh" + else + echo "feisty meow codebase is not available at: $FEISTY_MEOW_APEX" + fi fi # if not commented out, then feisty meow will run all the unit tests during builds.