run dircolors only when LS_COLORS is not set

[home.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index ad9468a90328d2a80fb6c8d84260ba1a42f9af03..bfb9f45101c91937fe1b66bb71aae52b5b772b56 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -23,8 +23,9 @@ export LESSCOLOR=0
 unset LDPATH # KDE bs
 
 shopt -s checkwinsize
+shopt -s no_empty_cmd_completion
 
-eval `dircolors 2>/dev/null`
+[ "${LS_COLORS+set}" = "set" ] || eval `dircolors 2>/dev/null`
 
 [ -r /usr/local/src/blackfin/bin/bfin-alias ] && . /usr/local/src/blackfin/bin/bfin-alias
 [ -r /usr/local/src/blackfin/git/toolchain/distribution/snapshots/bfin-alias ] && . /usr/local/src/blackfin/git/toolchain/distribution/snapshots/bfin-alias
@@ -34,4 +35,4 @@ eval `dircolors 2>/dev/null`
 export GTK2_RC_FILES="$HOME/.gtkrc-2.0:$HOME/.kde/share/config/gtkrc-2.0:/etc/gtk-2.0/gtkrc"
 
 ulimit -c $(( 512 * 1024 )) # units of KiB
-ulimit -u 600
+ulimit -u $(( 500 * $(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) ))