X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.bashrc;h=5c9b4a055481b96dedb66675db1c9797e3b91b5c;hp=dc51f1d7760fb7f9275d792a989ff7b657da0104;hb=c36d3924d6aa4ea711f344e215e2f5b8525fd0a0;hpb=e8f5860610f70af02ffe91fe4800530e71d06472

diff --git a/.bashrc b/.bashrc
index dc51f1d..5c9b4a0 100644
--- 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
@@ -382,7 +386,8 @@ function gpg {(unset gpg; http_proxy= all_proxy= HTTP_PROXY= ALL_PROXY= gpg "$@"
 ulimit -S -c 0
 set +H
 shopt -s mailwarn
-shopt -s direxpand
+#RHEL6->7 breaks: echo spa\ ce ~/foo<tab>
+#shopt -s direxpand
 unset OPTIND
 umask 022