X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.bashrc;h=6397fe3150914d0ae654374087ad4c71a24fdf2e;hp=5f039372870aa544e18d37a32e3d77711191006a;hb=b8be1b96db19decef6b6b1de6115aa7c5b50bb18;hpb=9e4ac2ba24863738f230a3763826a8a284f0039c

diff --git a/.bashrc b/.bashrc
index 5f03937..6397fe3 100644
--- a/.bashrc
+++ b/.bashrc
@@ -156,11 +156,13 @@ eval '
 	function ucwkbd { setxkbmap -layout us,cz -variant ,ucw -option grp:caps_switch; }
 '
 
+unset command_not_found_handle
+shopt -u progcomp # Disable 'bash-completion' rpm
 export IGNOREEOF=10
 # '2>/dev/null' to prevent: TMOUT: readonly variable
 [ -n "$SSH_TTY" ] && export TMOUT=900 2>/dev/null
 export EDITOR='vim'
-[ -x /bin/less ] && export PAGER='/bin/less -rMMh5cis'
+#broken: [ -x /bin/less ] && export PAGER='/bin/less -rMMh5cis'
 
 export PERL_LOCAL_LIB_ROOT="$HOME/perl5";
 export PERL_MB_OPT="--install_base $HOME/perl5";
@@ -173,11 +175,10 @@ for file in $HOME/.bookmarks.html;do
 	export WWW_HOME="file://$HOME/"
 	[ -r $file ] && export WWW_HOME="file://$file"
 	done
-export GREP_OPTIONS="--binary-files=without-match --directories=skip"
-if echo x|GREP_OPTIONS="--exclude=y" grep -q x 2>/dev/null;then
-	export GREP_OPTIONS="$GREP_OPTIONS --exclude=tags --exclude=TAGS --exclude=ChangeLog* --exclude=*.svn-base --exclude=*~"
+if echo x|grep --exclude=y -q x 2>/dev/null;then
+	alias grep='grep --exclude=tags --exclude=TAGS --exclude=ChangeLog* --exclude=*.svn-base --exclude=*~'
 	# FIXME: grep(1) ignores subdirectories for --exclude.
-	#export GREP_OPTIONS="$GREP_OPTIONS --exclude=testsuite --exclude=.pc --exclude=.svn --exclude=CVS --exclude=po"
+	# --exclude=testsuite --exclude=.pc --exclude=.svn --exclude=CVS --exclude=po
 fi
 if [ -n "$PS1" ];then	# set only in interactive sessions
 	if [ ! -f /MOCK ];then
@@ -234,6 +235,7 @@ export LC_COLLATE=C
 # http://lists.gnu.org/archive/html/bug-readline/2009-09/msg00006.html
 # 2>/dev/null for possible: stty: standard input: Inappropriate ioctl for device
 stty -echoctl 2>/dev/null
+export GIT_MERGE_AUTOEDIT=no
 
 function wclines { awk '{x[$0]++}END{for (i in x) print x[i]"\t"i}'; }
 # SunOS does not support "-m"
@@ -249,7 +251,7 @@ function finame { find . -false `
 	`; }
 function mkcd { mkdir -p "$1"; cd "$1"; }
 function pushdmk { mkdir -p "$1"; pushd "$1"; }
-function rsync {(unset rsync; n rsync -a -v -e ssh --progress --stats --inplace --rsync-path='nice -n20 ionice -c3 rsync' "$@"; );}
+function rsync {(unset rsync; n rsync -c -a -v -e ssh --progress --stats --inplace --rsync-path='nice -n20 ionice -c3 rsync' "$@"; );}
 function tohex { od -An -txC|tr -d '\n '|tr 'a-f' 'A-F';echo; }
 function edall {
 	find -type f|while read -r i;do
@@ -335,8 +337,7 @@ function sourcewarecvscheckout {(set -ex
 	#(set +x;cvsignoresall)
 	(set +x;ignoresall)
 	);}
-function gdbgitclone { git clone git://sourceware.org/git/gdb.git gdb-git; }
-function binutilsgitclone { git clone git://sourceware.org/git/binutils.git binutils-git; }
+function gdbgitclone { git clone git://sourceware.org/git/binutils-gdb.git gdb-git; }
 function archergitclone { git clone git://sourceware.org/git/archer.git archer-git; }
 function gdbcvscheckout { sourcewarecvscheckout gdb; }
 function binutilscvscheckout { sourcewarecvscheckout binutils; }
@@ -378,6 +379,7 @@ 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
 unset OPTIND
 umask 022