X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.bashrc;h=88a0a40d785780b7ef1e170d01af050161a4dd71;hp=29d098f0a61bb951ea0e36f04f6f93cb37236153;hb=38bdaa392257c530a091a96e60e32671bd069afe;hpb=9f75e490ed4f6bd614af3f068547a7577a2d9eaa

diff --git a/.bashrc b/.bashrc
index 29d098f..88a0a40 100644
--- a/.bashrc
+++ b/.bashrc
@@ -84,7 +84,7 @@ _bash_profile_addpath -s JAVA_HOME       "/usr/java"
 _bash_profile_addpath -s JAVA_HOME       "/usr/local/java"
 uname_p="`uname -p 2>/dev/null || uname -m`"
 [ "`uname`" = "SunOS" ] && _bash_profile_addpath -f LD_LIBRARY_PATH "$HOME/Netscape/dist/lib"
-for family in "/net/jsc-nfs.czech.sun.com/export/jscqa-local" "$HOME";do
+for family in "$HOME";do
 	for arch in "$family" $family/$uname_p;do
 		# Do not "-f": We use /net !
 		_bash_profile_addpath PATH            "$arch/bin"
@@ -118,7 +118,7 @@ unset -f _bash_profile_addpath_fini
 
 for i in tar ls find cp mv ln md5sum du grep ar chown chmod tail;do
 	# Prevent g$i from system directory overriding customized $i binary
-	which $i 2>/dev/null | grep /net/jsc-nfs.czech.sun.com/export/jscqa-local/ >/dev/null && continue
+	###which $i 2>/dev/null | grep /net/jsc-nfs.czech.sun.com/export/jscqa-local/ >/dev/null && continue
 	which g$i 2>/dev/null | grep '^/' >/dev/null && alias $i=g$i
 	done
 
@@ -140,9 +140,12 @@ alias cvsignoresrm='cvsutil --ignores --rm'
 alias cvsignoresrmall='cvsutil --ignores --workings --rm'
 alias cvsignoresallrm='cvsutil --ignores --workings --rm'
 [ "`uname`" = "SunOS" -a -x $HOME/bin/rpm-by-pkg ] && alias rpm='rpm-by-pkg'
-alias rpmdb='rpm --define "_dbpath `echo /usr/lib/rpmdb/*/*`"'
 alias disass='objdump -D --target=binary --architecture=i386'
 alias cal='cal -m'
+alias vncreadonly='vncviewer -FullColor -Shared -ViewOnly'
+alias diff='diff -u'
+alias rpmqf='rpm --qf "%{name}-%{version}-%{release}.%{arch}\n"'
+alias gdbn='gdb -nx --command=~/.gdbinit'
 
 # '2>/dev/null' to prevent: unalias: x: not found
 unalias 2>/dev/null cp	# -i
@@ -184,9 +187,14 @@ if grep 2>/dev/null -q '^..............:0C38 00000000:0000 0A ' /proc/net/tcp;th
 	export https_proxy=http://127.0.0.1:3128/
 	export   ftp_proxy=http://127.0.0.1:3128/
 fi
-export VIMINIT="source `echo "${BASH_SOURCE:-$BASH_ENV}"|sed 's/[.]bashrc$/.vimrc/'`"
+_selfabs=
+[ "$_selfabs" = "${_selfabs#/}" ] && _selfabs="$BASH_SOURCE"
+[ "$_selfabs" = "${_selfabs#/}" ] && _selfabs="$BASH_ENV"
+[ "$_selfabs" = "${_selfabs#/}" ] && _selfabs="$PWD/.bashrc"
+[ -r "$_selfabs" ] || unset _selfabs
+[ -n "$_selfabs" ] && export VIMINIT="source `echo "$_selfabs"|sed 's/[.]bashrc$/.vimrc/'`"
 
-export SOCKS5_SERVER=icsocks.holland.sun.com
+###export SOCKS5_SERVER=icsocks.holland.sun.com
 
 # Force English.
 unset LANG LANGUAGE `set|sed -n 's/^\(LC_[^=]*\)=.*$/\1/p'`
@@ -225,11 +233,14 @@ function mi { (
 	); };export -f mi
 function ctags {(unset ctags;
 	if [ $# -ne 0 -a '(' $# -ne 1 -o "$1" '!=' "--c-types=+px" ')' ];then ctags "$@";else
-		find -type f -a '!' -name tags -a '!' -name TAGS -a '(' -false \
+		find -name testsuite -prune -o \
+				-type f -a '!' -name tags -a '!' -name TAGS -a '(' -false \
 						-o -name "*.[chC]" \
 						-o -name "*.cc"    \
+						-o -name "*.cxx"   \
 						-o -name "*.java"  \
 						-o -name "*.p[lm]" \
+						-o -name "*.py" \
 						')' \
 				|ctags --file-tags -L - "$@"
 	fi; );}; export -f ctags
@@ -241,6 +252,25 @@ function debuginfo { if test -n "$*";then echo "$*";else cat;fi \
 	|xargs rpm -qf|xargs rpmquery --qf '%{SOURCERPM}\n'|sed 's/-[^-]*-[^-]*[.]src[.]rpm$/-debuginfo/'|sort -u; }
 function ipcsrmall { ipcs|awk '/- Shared Memory/{x="-m"}/- Semaphore/{x="-s"}/^0x/{print "ipcrm "x" "$2}'; }
 function eog {(unset eog; touch /tmp/eog.$$;eog "$@" {,,,,,,,,,}/tmp/eog.$$;rm -f /tmp/eog.$$; );}; export -f eog
+function diffc { diff -u "$@"|grep -v '^\(Only in \|Binary files\)'; }; export -f diffc
+function diffi { diffc -X ~/.diffi.list "$@"; }; export -f diffi
+function cvs {(unset cvs;
+	local _opts _opts_d _now _line _o
+	if grep -iw "sources.redhat.com:/cvs/src" CVS/Root &>/dev/null;then _opts_d="";else _opts_d="-d";fi
+	_now=false
+	_line=""
+	_opts=""
+	while [ $# != 0 ];do
+		_o="$1"
+		shift
+		_line="$_line $_o"
+		if [ "$_o" = "--" ] && ! $_now;then _now=true;continue;fi
+		if [ "${_o#-}" != "$_o" ] && ! $_now;then continue;fi
+		if [ "$_o" = update -o "$_o" = upd -o "$_o" = up ];then _opts="$_opts_d";fi
+		break
+		done
+	cvs $_line $_opts "$@"
+	); }; export -f cvs
 
 ulimit -S -c 0
 set +H