projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git hist alias added
[feisty_meow.git]
/
infobase
/
feisty_inits
/
dot.bashrc-normal-user
diff --git
a/infobase/feisty_inits/dot.bashrc-normal-user
b/infobase/feisty_inits/dot.bashrc-normal-user
index f64bbcfcf3d5cd178eff7d7468d06f9ab9239e26..9c15d01120ecaa85b661bb9186fa9bcd40c4a69c 100644
(file)
--- 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
# 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
##############
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
# 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.
fi
# if not commented out, then feisty meow will run all the unit tests during builds.