unalias: +egrep,+fgrep

[nethome.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index dc51f1d..2a70cfe 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -112,7 +112,9 @@ unalias 2>/dev/null du      # -h
 unalias 2>/dev/null ls # --color=auto
 unalias 2>/dev/null l. # ls -d .* --color=auto
 unalias 2>/dev/null ll # ls -l --color=auto
-unalias 2>/dev/null grep       # grep --color=auto
+unalias 2>/dev/null grep       # /etc/profile.d/colorgrep.sh
+unalias 2>/dev/null egrep      # /etc/profile.d/colorgrep.sh
+unalias 2>/dev/null fgrep      # /etc/profile.d/colorgrep.sh
 
 # Prevent processing of aliases during the parsing of this script file by
 # `eval':
@@ -204,8 +206,10 @@ export MAKEFLAGS=
 cpus="`getconf _NPROCESSORS_ONLN`"
 if [ -n "$cpus" ];then
        # *3/2 was OOM for host1 32 CPUs + 16GB RAM
-       # *1   was OK  for host1 32 CPUs + 16GB RAM
-       MAKEFLAGS="$MAKEFLAGS -j$[$cpus]"
+       # *1 was OOM for host1 ccache -C;touch gui.h;time make all
+       # *3/4 was also OOM with KVM running
+       # *1/2 was OK for host1 32 CPUs + 16GB RAM
+       MAKEFLAGS="$MAKEFLAGS -j$[$cpus*1]"
 fi
 unset cpus
 # Do not: grep -w "$TERM" /etc/termcap >/dev/null || export TERM=vt220