fully functional death star

[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 20a9023fadd3d1f596d6dc5f35b807923395a661..944ed1ad3ae663238a0c33d44ca49ebd79089d3f 100644 (file)
--- 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,13 +24,13 @@ 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 which makes more sense to most people.
+alias feistyme='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