X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=.bashrc;h=289a0f9cd341fea76db427157e5ff30961c00f6d;hb=419f1f9c280d7b56293cb17ceab969ed32c9d2e1;hp=27dd64e385e86c713771466fd413c79efa004073;hpb=8f972b0a2fd4adde9c74169099039ac62b40047c;p=nethome.git

diff --git a/.bashrc b/.bashrc
index 27dd64e..289a0f9 100644
--- a/.bashrc
+++ b/.bashrc
@@ -10,7 +10,8 @@ if [ -n "$_home_short_dotbashrc_norc" -o "${TERM#norc-}" != "$TERM" ];then
 	export _home_short_dotbashrc=true
 fi
 
-if [ -z "$_home_short_dotbashrc" ];then
+# "$PS1" for interactive shells detection.
+if [ -n "$PS1" -a -z "$_home_short_dotbashrc" ];then
 	# We permit later reinitialization by unsetting it.
 	# During our execution we forbid spawning to prevent deadlock by:
 	# 	source /etc/bashrc
@@ -84,8 +85,8 @@ _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
+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"
@@ -96,7 +97,7 @@ for family in "$HOME";do
 		_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"
@@ -108,7 +109,8 @@ _bash_profile_addpath    -s ANT_HOME "/usr/local/ant"
 mkdir -p $HOME/lib/perl5	# otherwise CPAN will install to "$HOME/lib/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"
+	# $PERL5LIB overrides $PERLLIB and it is being used by: /etc/profile.d/atrpms.*
+	_bash_profile_addpath -f PERL5LIB "$_perldir"
 	done
 unset _perldir
 
@@ -126,7 +128,11 @@ alias ls='ls -bF'
 alias l='ls -lbF'
 alias maple="ssh -t vega.fjfi.cvut.cz maple"
 #alias cc='cc -I/home/short/include'
-alias vi='vim'
+if which vim &>/dev/null;then
+	alias vi='vim'
+else
+	echo >&2 'WARNING: No vim(1).'
+fi
 alias grepb='grep --binary-files=binary'
 alias L='lynx'
 alias chown='chown --no-dereference'
@@ -139,12 +145,15 @@ alias cvsignoresall='cvsutil --ignores --workings --print'
 alias cvsignoresrm='cvsutil --ignores --rm'
 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 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 rpmbuildlocal='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
 unalias 2>/dev/null cp	# -i
@@ -164,7 +173,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 --exclude=tags --exclude=TAGS --exclude=CVS"
+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"
+fi
 if [ -n "$PS1" ];then	# set only in interactive sessions
 	export PS1='[bash]${LOGNAME}@${HOSTNAME}:${PWD}# '
 	export PS1='\[\017\]'"$PS1"	# \017=std charmap
@@ -188,7 +200,6 @@ if grep 2>/dev/null -q '^..............:0C38 00000000:0000 0A ' /proc/net/tcp;th
 fi
 _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/'`"
@@ -232,13 +243,17 @@ 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 -name .pc -prune -o -name .svn -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" \
+						-o -name "*.exp" \
 						')' \
-				|ctags --file-tags -L - "$@"
+				|ctags --file-tags -L - --langmap=Tcl:+.exp "$@"
 	fi; );}; export -f ctags
 function ctagsh { ctags "--c-types=+px"; }; export -f ctagsh
 function cpan {(unset cpan; if [ $# = 0 ];then cpan;else perl -MCPAN -e "install qw($*);";fi; );}; export -f cpan
@@ -250,11 +265,30 @@ function ipcsrmall { ipcs|awk '/- Shared Memory/{x="-m"}/- Semaphore/{x="-s"}/^0
 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\|sourceware.org\):/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
+function perlrpm { repoquery -q --whatprovides $(for i in "$@";do echo "perl($i)";done|sed -e 's/\//::/g' -e 's/[.]pm//g'); }; export -f perlrpm
 
 ulimit -S -c 0
 set +H
 shopt -s mailwarn
 unset OPTIND
+umask 022
 
 if [ -f "$HOME/.bashrc.local" ];then source "$HOME/.bashrc.local";fi