X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.bashrc;h=88a0a40d785780b7ef1e170d01af050161a4dd71;hp=c87c1b772529ef34c4eb5350070c1b7e60990697;hb=38bdaa392257c530a091a96e60e32671bd069afe;hpb=37a96cc389591663e56ca85a729189b6be46d397 diff --git a/.bashrc b/.bashrc index c87c1b7..88a0a40 100644 --- a/.bashrc +++ b/.bashrc @@ -30,11 +30,12 @@ fi if [ -f /etc/bashrc ];then source /etc/bashrc;fi +_bash_profile_addpath_fini="" function _bash_profile_addpath # , { local _varname _varval _varvalold _dirpathname _opt_f _opt_s _opt_f=0;_opt_s=0 - unset OPTIND + unset -v OPTIND while getopts fs got;do case "$got" in [fs]) eval "_opt_$got=1" ;; @@ -47,17 +48,21 @@ function _bash_profile_addpath # , if [ $_opt_s = 1 -o -z "`eval "echo \\${$_varname}"`" ];then eval "$_varname='$_dirpathname'" else + # We want to prevent duplicates due to .bashrc reentrancy across fork(2)s. It is array! + _bash_profile_addpath_fini="$_bash_profile_addpath_fini $_varname" # We want to override any original directories, place dirpathname first! - # We want to prevent duplicates due to .bashrc reentrancy across fork(2)s. - eval "_varval=\":\${$_varname}:\"" - until [ "$_varval" = "$_varvalold" ];do - _varvalold="$_varval" - eval "_varval=\"$(echo "$_varval"|sed "s#:$_dirpathname:#:#g")\"" - done - eval "$_varname=\"$_dirpathname$(echo "$_varval"|sed "s#:\$##g")\"" + eval "$_varname=\"$_dirpathname:\${$_varname}\"" fi export "$_varname" } +function _bash_profile_addpath_fini +{ + local _varname + for _varname in `echo "$_bash_profile_addpath_fini"|tr ' ' '\n'|sort -u`;do + eval "$_varname=\"`eval $(echo "echo \"\\$$_varname\"")|awk -v RS=':' '/[^\n]/{if (!x[$0]++) e=e":"$0;}END{print substr(e,2)}'`\"" + done + unset -v _bash_profile_addpath_fini +} # Use reverse order of preferred directories: # gid(1) dependency on: /opt/sfw/bin @@ -79,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" @@ -102,16 +107,18 @@ _bash_profile_addpath -s ANT_HOME "/usr/local/ant" # /lib/perl5 for Fedora Core 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/perl5,/share/perl,/lib/perl}{,/site_perl}$_perlpatt");do +for _perldir in $(eval "echo {/usr,$HOME}{/lib{,64}/perl{,5},/share/perl}{,/site_perl}$_perlpatt");do _bash_profile_addpath -f PERLLIB "$_perldir" done unset _perldir unset -f _bash_profile_addpath +_bash_profile_addpath_fini +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 @@ -123,6 +130,8 @@ alias vi='vim' alias grepb='grep --binary-files=binary' alias L='lynx' alias chown='chown --no-dereference' +alias chgrp='chgrp --no-dereference' +alias hexedit='hexedit -s' alias cvs2cl='cvs2cl --window 3600 --separate-header --no-wrap' alias cvsfiles='cvsutil --files --print' alias cvsignores='cvsutil --ignores --print' @@ -131,7 +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 @@ -173,8 +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 +_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'` @@ -186,11 +206,6 @@ export LC_COLLATE=C # export LC_ALL=C # as it breaks Mutt "utf-8" and somehow it is no longer needed. -function cvsdiff { cvs diff "$@" 2>&1|pipebuf -q| less; }; export -f cvsdiff -function cvsdiffi { cvs diff "$@" 2>&1|pipebuf -q|grep -v '^?'|less; }; export -f cvsdiffi -function cvsupdate { cvs update "$@" 2>&1|pipebuf -q| less; }; export -f cvsupdate -function cvsupdatei { cvs update "$@" 2>&1|pipebuf -q|grep -v '^?'|less; }; export -f cvsupdatei - function wclines { awk '{x[$0]++}END{for (i in x) print x[i]"\t"i}'; }; export -f wclines # SunOS does not support "-m" export ULIMITME_OPTS="" @@ -218,18 +233,44 @@ 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 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 function exx { cd "`unset exx;exx "$@"|tee /proc/self/fd/2|tail -n1|sed -n 's/^extdir=//p'`"; };export -f exx -function revlines { perl -e 'my @r=();push @r,$_ while (<>);print pop @r while @r;'; }; export -f revlines +function revlines { perl -e 'print reverse <>;'; }; export -f revlines +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 @@ -241,7 +282,8 @@ if [ -f "$HOME/.bashrc.local" ];then source "$HOME/.bashrc.local";fi # Interactive part: for key in $HOME/.ssh/id_dsa;do [ -r "$key" ] || continue - [ -n "$SSH_TTY" ] && continue + # Do not: [ -n "$SSH_TTY" ] && continue + # as we may want foreign SSH keys too. agenteval=/tmp/.$USER.ssh-agent.eval if lockfile -1 -r 3 -l 10 -s 1 $agenteval.lock;then