X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.bashrc;h=29d098f0a61bb951ea0e36f04f6f93cb37236153;hp=289d2e301b5c448e6a45e89335f82de72b71c52e;hb=758e41d858c710cbdab3119b62839a6b3c1463f4;hpb=f86043f305e9877f64790c6a13664e47a8a1e3d7 diff --git a/.bashrc b/.bashrc index 289d2e3..29d098f 100644 --- a/.bashrc +++ b/.bashrc @@ -11,18 +11,31 @@ if [ -n "$_home_short_dotbashrc_norc" -o "${TERM#norc-}" != "$TERM" ];then fi if [ -z "$_home_short_dotbashrc" ];then - _home_short_dotbashrc=true + # We permit later reinitialization by unsetting it. + # During our execution we forbid spawning to prevent deadlock by: + # source /etc/bashrc + # . /etc/profile.d/lang.sh + # unicode_start iso02.08 + export _home_short_dotbashrc=true # $TERM gets restored to its 'norc-' state after ~/.bashrc # alias norc='TERM="norc-$TERM" ssh -t -o 'NoHostAuthenticationForLocalhost yes' $USER@localhost "cd $PWD; TERM=$TERM;"' function norc { TERM="norc-$TERM" ssh -t -o 'NoHostAuthenticationForLocalhost yes' $USER@localhost "cd $PWD; TERM=$TERM;" "$@"; }; export -f norc +# Fix $USER and $LOGNAME (not $MAIL) for /etc/passwd line: +# root-lace:x:0:0:root for Jan Kratochvil:/home/root-lace:/bin/bash +if [ "$UID" -eq 0 -a "$USER" = "root" -a "$HOME" != "${HOME#*/root-}" ];then + USER="${HOME##*/}" + LOGNAME="$USER" +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" ;; @@ -35,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 @@ -90,12 +107,14 @@ _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 @@ -110,6 +129,9 @@ alias maple="ssh -t vega.fjfi.cvut.cz maple" 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' @@ -119,6 +141,8 @@ 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' # '2>/dev/null' to prevent: unalias: x: not found unalias 2>/dev/null cp # -i @@ -129,7 +153,7 @@ unalias 2>/dev/null du # -h export IGNOREEOF=10 # '2>/dev/null' to prevent: TMOUT: readonly variable -export TMOUT=900 2>/dev/null +[ -n "$SSH_TTY" ] && export TMOUT=900 2>/dev/null export EDITOR='vim' [ -x /bin/less ] && export PAGER='/bin/less -MMh5cis' export PERL_MM_OPT="PERL=$HOME/bin/perlilib" @@ -149,11 +173,18 @@ if [ -n "$PS1" ];then # set only in interactive sessions export MINICOM="-m -c on" # metakeys+color export HISTSIZE=100000 export HISTFILESIZE="$HISTSIZE" +export GDBHISTFILE="$HOME/.gdb_history" export CVS_RSH="ssh" # Do not: grep -w "$TERM" /etc/termcap >/dev/null || export TERM=vt220 # as Sun workaround as Debian misses: /etc/termcap # expects: $uname_p [ "$TERM" = vt220 -a "${uname_p%86}" != "$uname_p" ] && export TERM=linux +if grep 2>/dev/null -q '^..............:0C38 00000000:0000 0A ' /proc/net/tcp;then + export http_proxy=http://127.0.0.1:3128/ + 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/'`" export SOCKS5_SERVER=icsocks.holland.sun.com @@ -167,11 +198,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="" @@ -210,15 +236,59 @@ function ctags {(unset 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 -ulimit -c 0 +ulimit -S -c 0 set +H shopt -s mailwarn unset OPTIND if [ -f "$HOME/.bashrc.local" ];then source "$HOME/.bashrc.local";fi +# Interactive part: +for key in $HOME/.ssh/id_dsa;do + [ -r "$key" ] || 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 + test -f $agenteval -a -O $agenteval -a -G $agenteval && + # ">/dev/null" to prevent: echo Agent pid 31074; + source $agenteval >/dev/null + if [ "ssh-agent" != "`(xargs -0 /dev/null `" ];then + rm -f $agenteval + (test ! -e $agenteval && ssh-agent -s >$agenteval) || echo >&2 'Failing ssh-agent!' + # ">/dev/null" to prevent: echo Agent pid 31074; + source $agenteval >/dev/null + fi + rm -f $agenteval.lock + fi + + # Prevent gdm(8) lockups on non-interactive consoles. + tty -s || continue + (ssh-add -l|grep -qw "$key") && continue + if lockfile -! -1 -r 0 $agenteval.input.lock 2>/dev/null;then + echo >&2 -n "Locking: $agenteval.input.lock ... " + lockfile -1 -r -1 $agenteval.input.lock + echo >&2 "locked" + fi + # Recheck identity existence after the lock acquire + if ssh-add -l|grep -qw "$key";then + echo >&2 "Identity $key already appended in the meantime." + else + # "2>/dev/null" to prevent: Identity added: .ssh/id_dsa (.ssh/id_dsa) + ssh-add "$key" 2>/dev/null + fi + rm -f $agenteval.input.lock + echo >&2 "$agenteval.input.lock unlocked." +done +unset agenteval + unset _home_short_dotbashrc # permit later reinitializations fi # _home_short_dotbashrc