X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=infobase%2Ffeisty_inits%2Fdot.bashrc-normal-user;h=0f185f79c91000730563209c03a886cb095a098c;hb=de0da7f2f7958d4ba652ff2ef5c79991700141ac;hp=615970aa422bc56e1a333c0e38a10f6eef792bc7;hpb=55da0d66ce152a2dd06f6d572320b993962221d1;p=feisty_meow.git

diff --git a/infobase/feisty_inits/dot.bashrc-normal-user b/infobase/feisty_inits/dot.bashrc-normal-user
index 615970aa..0f185f79 100644
--- a/infobase/feisty_inits/dot.bashrc-normal-user
+++ b/infobase/feisty_inits/dot.bashrc-normal-user
@@ -1,19 +1,24 @@
 
 ##############
 
-# initializes the feisty meow environment for "normal" users (not intended for the root user).
+# initialize the feisty meow environment for "normal" users.
+# this is not intended for the root user, because having a bunch of extra
+# scripts automatically loaded into root's environment is not a good idea.
 
 ##############
 
-# 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
+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
 
 ##############
 
-# set the history sizes to be much larger, and do this whether we load the
-# feisty meow environment or not.
-
+# set the history sizes to be much larger; important to have good history.
 export HISTSIZE=1000000
 export HISTFILESIZE=8000000
 
@@ -24,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.