Initial untested version.

[nethome.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 24f965a..289a0f9 100644 (file)
--- 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
@@ -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
 
@@ -150,7 +152,6 @@ 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 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'
 
@@ -172,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
@@ -239,7 +243,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 \
+               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"    \
@@ -278,11 +282,13 @@ function cvs {(unset cvs;
                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