projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-2.140.136'
[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 fde023212e7de61709a0d8c90674f7a99cb34296..0f185f79c91000730563209c03a886cb095a098c 100644
(file)
--- a/
infobase/feisty_inits/dot.bashrc-normal-user
+++ b/
infobase/feisty_inits/dot.bashrc-normal-user
@@
-1,7
+1,9
@@
##############
##############
-# 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.
##############
##############
@@
-9,13
+11,14
@@
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
##############
-# 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
export HISTSIZE=1000000
export HISTFILESIZE=8000000