X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.bashrc;h=928315faa4517f8e2e0db300bd1a6d83e1abfb09;hp=8de814857783d9de04083a49ac43d88a4d51645b;hb=edcc77643ce7cc703aa93529b5648da5534bb907;hpb=9563a9c255693fce3106ee916db556868238e378

diff --git a/.bashrc b/.bashrc
index 8de8148..928315f 100644
--- a/.bashrc
+++ b/.bashrc
@@ -68,36 +68,28 @@ function _bash_profile_addpath_fini
 # Use reverse order of preferred directories:
 # gid(1) dependency on: /opt/sfw/bin
 # EUID="`id -u 2>/dev/null || /usr/xpg4/bin/id -u 2>/dev/null || gid -u`"
-_bash_profile_addpath -f PATH            "/opt/SUNWspro/bin"
-_bash_profile_addpath -f PATH            "/usr/dist/exe"
 _bash_profile_addpath -f PATH            "/sbin"
 _bash_profile_addpath -f PATH            "/usr/sbin"
-_bash_profile_addpath -f PATH            "/opt/sfw/bin"
-[ -x $HOME/bin/ProductivityTools-check ] && eval `$HOME/bin/ProductivityTools-check`
-[ -n "$PATH_PRODUCTIVITY_TOOLS" ] && _bash_profile_addpath -f PATH "$PATH_PRODUCTIVITY_TOOLS"
 [ $EUID -eq 0 ] && _bash_profile_addpath -f PATH "/usr/local/sbin"
 _bash_profile_addpath -f PATH            "/usr/local/bin"
-_bash_profile_addpath -f LD_LIBRARY_PATH "/opt/sfw/lib"
 _bash_profile_addpath -f MANPATH         "/usr/X11R6/man"
 _bash_profile_addpath -f MANPATH         "/usr/share/man"
 _bash_profile_addpath -f MANPATH         "/usr/local/man"
 _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 $HOME;do
 	for arch in $family $family/$uname_p;do
 		# Do not "-f": We use /net !
 		_bash_profile_addpath PATH            "$arch/bin"
-		_bash_profile_addpath PATH            "$arch/OpenOffice.org"
-		_bash_profile_addpath PATH            "$arch/forte4j/extbin"
 		_bash_profile_addpath -s JAVA_HOME    "$arch/java"
 		[ $EUID -eq 0 ] && _bash_profile_addpath PATH "$arch/sbin"
+		_bash_profile_addpath LD_LIBRARY_PATH "$arch/lib64"
 		_bash_profile_addpath LD_LIBRARY_PATH "$arch/lib"
 		_bash_profile_addpath MANPATH         "$arch/man"
 		done
 	done
-_bash_profile_addpath -f -s CVSROOT "short@vellum.cz:/home/short/pserver/cvs"	# default
+_bash_profile_addpath -f -s CVSROOT ":pserver:pserver:@cvs.jankratochvil.net/cvs"	# default
 [ -n "$JAVA_HOME" ] && _bash_profile_addpath PATH "$JAVA_HOME/bin"
 _bash_profile_addpath    -s CVSROOT "$HOME/pserver/cvs"
 _bash_profile_addpath    -s CVSROOT "$HOME/cvs"
@@ -106,10 +98,11 @@ _bash_profile_addpath    -s ANT_HOME "/usr/local/ant"
 # /share/perl for Debian
 # /lib/perl for Debian
 # /lib/perl5 for Fedora Core
-mkdir -p $HOME/lib/perl5	# otherwise CPAN will install to "$HOME/lib/site_perl" etc.
+mkdir -p $HOME/lib{64,}/perl5	# otherwise CPAN will install to "$HOME/lib{64,}/site_perl" etc.
 _perlpatt="$(perl -MConfig -e 'print "{,/".$Config{$_}."}" for qw(version archname);')"
-for _perldir in $(eval "echo {/usr,$HOME}{/lib{,64}/perl{,5},/share/perl}{,/site_perl}$_perlpatt");do
-	_bash_profile_addpath -f PERLLIB "$_perldir"
+for _perldir in $(eval "echo {/usr,$HOME}{/lib{64,}/perl{,5},/share/perl}{,/site_perl}$_perlpatt");do
+	# $PERL5LIB overrides $PERLLIB and it is being used by: /etc/profile.d/atrpms.*
+	_bash_profile_addpath -f PERL5LIB "$_perldir"
 	done
 unset _perldir
 
@@ -119,7 +112,6 @@ 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 g$i 2>/dev/null | grep '^/' >/dev/null && alias $i=g$i
 	done
 
@@ -146,12 +138,11 @@ alias cvsignoresrmall='cvsutil --ignores --workings --rm'
 alias cvsignoresallrm='cvsutil --ignores --workings --rm'
 alias svnignoresall='svn status |sed -n "s/^[?]      //p"'
 alias svnignoresallrm='svn status |sed -n "s/^[?]      //p"|tr "\n" "\0"|xargs -0 rm -rf'
-[ "`uname`" = "SunOS" -a -x $HOME/bin/rpm-by-pkg ] && alias rpm='rpm-by-pkg'
 alias disass='objdump -D --target=binary --architecture=i386'
 alias cal='cal -m'
 alias vncreadonly='vncviewer -FullColor -Shared -ViewOnly'
 alias diff='diff -u'
-alias rpmbuildlocal='rpmbuild --define "_topdir $PWD" --define "_builddir $PWD" --define "_rpmdir $PWD" --define "_sourcedir $PWD" --define "_specdir $PWD" --define "_srcrpmdir $PWD"'
+alias rpmbuildlocal='nice rpmbuild --define "_topdir $PWD" --define "_builddir $PWD" --define "_rpmdir $PWD" --define "_sourcedir $PWD" --define "_specdir $PWD" --define "_srcrpmdir $PWD"'
 alias gdbn='gdb -nx --command=~/.gdbinit'
 
 # '2>/dev/null' to prevent: unalias: x: not found
@@ -174,7 +165,9 @@ for file in $HOME/.bookmarks.html;do
 	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=CVS"
+	export GREP_OPTIONS="$GREP_OPTIONS --exclude=tags --exclude=TAGS --exclude=CVS --exclude=ChangeLog*"
+	# FIXME: grep(1) ignores subdirectories for --exclude.
+	#export GREP_OPTIONS="$GREP_OPTIONS --exclude=testsuite --exclude=.pc --exclude=.svn"
 fi
 if [ -n "$PS1" ];then	# set only in interactive sessions
 	export PS1='[bash]${LOGNAME}@${HOSTNAME}:${PWD}# '
@@ -203,8 +196,6 @@ _selfabs=
 [ -r "$_selfabs" ] || unset _selfabs
 [ -n "$_selfabs" ] && export VIMINIT="source `echo "$_selfabs"|sed 's/[.]bashrc$/.vimrc/'`"
 
-###export SOCKS5_SERVER=icsocks.holland.sun.com
-
 # Force English.
 unset LANG LANGUAGE `set|sed -n 's/^\(LC_[^=]*\)=.*$/\1/p'`
 export LANG=en_US.UTF-8
@@ -230,7 +221,7 @@ function finame { find . -false `
 	`; }; export -f finame
 function mkcd { mkdir -p "$1"; cd "$1"; }; export -f mkcd
 function pushdmk { mkdir -p "$1"; pushd "$1"; }; export -f pushdmk
-function rsync {(unset rsync; rsync -v -e ssh --progress --stats --partial --block-size=512 "$@"; );}; export -f rsync
+function rsync {(unset rsync; nice -n20 rsync -v -e ssh --progress --stats --partial --rsync-path='nice -n20 rsync' "$@"; );}; export -f rsync
 function tohex { od -An -txC|tr -d '\n '|tr 'a-f' 'A-F';echo; }; export -f tohex
 function edall {
 	find -type f|while read -r i;do
@@ -242,7 +233,7 @@ function mi { (
 	); };export -f mi
 function ctags {(unset ctags;
 	if [ $# -ne 0 -a '(' $# -ne 1 -o "$1" '!=' "--c-types=+px" ')' ];then ctags "$@";else
-		find -name testsuite -prune -o -name .pc -prune -o -name .svn -o \
+		find -name testsuite -prune -o -name .pc -prune -o -name .svn -prune -o \
 				-type f -a '!' -name tags -a '!' -name TAGS -a '(' -false \
 						-o -name "*.[chC]" \
 						-o -name "*.cc"    \
@@ -266,7 +257,9 @@ function diffc { diff -u "$@"|grep -v '^\(Only in \|Binary files\)'; }; export -
 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\|sourceware.org\):/cvs/src' CVS/Root &>/dev/null;then _opts_d="";else _opts_d="-d";fi
+	_opts_d="-d"
+	if grep -iw '\(sources.redhat.com\|sourceware.org\):/cvs/src' CVS/Root &>/dev/null;then _opts_d="";fi
+	if grep '^tests/kernel/syscalls/ptrace' CVS/Repository &>/dev/null;then _opts_d="";fi
 	_now=false
 	_line=""
 	_opts=""
@@ -287,6 +280,7 @@ ulimit -S -c 0
 set +H
 shopt -s mailwarn
 unset OPTIND
+umask 022
 
 if [ -f "$HOME/.bashrc.local" ];then source "$HOME/.bashrc.local";fi