tweaks to startup

[feisty_meow.git] / infobase / feisty_inits / dot.bashrc-root

diff --git a/infobase/feisty_inits/dot.bashrc-root b/infobase/feisty_inits/dot.bashrc-root
index b3ff3381074e72f7ee45695602bb5a23e5d572bf..ddc131a85103381e8dd154401172538d9c771f99 100644 (file)
--- a/infobase/feisty_inits/dot.bashrc-root
+++ b/infobase/feisty_inits/dot.bashrc-root
@@ -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
 
 ##############
@@ -24,10 +27,9 @@ export HISTFILESIZE=8000000
 # system-wide install (will be fixed by connect_feisty_meow script):
 export FEISTY_MEOW_APEX="/opt/feistymeow.org/feisty_meow"
 
-# the "fredme" macro enables the feisty_meow environment.
-alias fredme='source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"'
-# synonym for fredme which makes more sense to most people.
-alias feistyme='source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"'
+# the "gofeisty" macro enables the feisty_meow environment.  this can be used
+# after logging in, and avoids loading the feisty meow environment automatically.
+alias gofeisty='source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"'
 
 # if not commented out, then feisty meow will run all the unit tests during builds.
 #export RUN_ALL_TESTS=true