X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=infobase%2Ffeisty_inits%2Fdot.bashrc-root;h=ddc131a85103381e8dd154401172538d9c771f99;hb=38cd3c8d062fbefc5d4df3915df94e28f20d0f19;hp=1b1dd1e23b279db6c64416b4c609fee2fd0c843f;hpb=4989de106abcde862cf9b4e1278266d18461568b;p=feisty_meow.git

diff --git a/infobase/feisty_inits/dot.bashrc-root b/infobase/feisty_inits/dot.bashrc-root
index 1b1dd1e2..ddc131a8 100644
--- a/infobase/feisty_inits/dot.bashrc-root
+++ b/infobase/feisty_inits/dot.bashrc-root
@@ -5,9 +5,14 @@
 
 ##############
 
-# 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
 
 ##############
 
@@ -19,15 +24,12 @@ 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"'
-# synonym for fredme.
-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