X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.bashrc;h=cc53b706eb54724d2246927a885ad9c646e3aa4a;hp=32ca2bbc8a14e75b3ce9025b435cf7b2d6495306;hb=4726f26d74751bbc05eca069cbe6284976aed530;hpb=f694b0aaee084fad22cb97fa4863ea60400a3717 diff --git a/.bashrc b/.bashrc index 32ca2bb..cc53b70 100644 --- a/.bashrc +++ b/.bashrc @@ -97,7 +97,7 @@ _bash_profile_addpath -s CVSROOT "$HOME/pserver/cvs" _bash_profile_addpath -s CVSROOT "$HOME/cvs" _bash_profile_addpath -s ANT_HOME "/usr/local/ant" -for _perldir in $(eval "echo $HOME{/share,/lib{,64}}/perl5");do +for _perldir in $(eval "echo $HOME{/share,/lib{,64}}/perl5{/site_perl,}");do _bash_profile_addpath -f PERL5LIB "$_perldir" done unset _perldir @@ -150,7 +150,7 @@ eval ' function disass { objdump -D --target=binary --architecture=i386 "$@"; } function cal {(unset cal; ( cal -m "$@"; ); );} function vncreadonly { vncviewer -FullColor -Shared -ViewOnly "$@"; } - function diff {(unset diff; ( diff -up "$@"; ); );} + function diff {(unset diff; ( diff -dup "$@"; ); );} function rpmbuildlocal { nice rpmbuild --define "_topdir $PWD" --define "_builddir $PWD" --define "_rpmdir $PWD" --define "_sourcedir $PWD" --define "_specdir $PWD" --define "_srcrpmdir $PWD" --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" "$@"; rmdir &>/dev/null BUILDROOT; } function gdbn { gdb -nx --command=~/.gdbinit "$@"; } function hd { od -Ax -tx1; } @@ -277,7 +277,7 @@ 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.$$; );} -function diffc { diff -up "$@"|grep -v '^\(Only in \|Binary files\)'; } +function diffc { diff -dup "$@"|grep -v '^\(Only in \|Binary files\)'; } function diffi { diffc -X ~/.diffi.list "$@" | diffdecvs; } function cvs {(unset cvs local _opts _opts_d _now _line _o