X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=.bashrc;h=eb34f40d02045ea28dec0596947e4e011b4d1562;hb=ab9ac6c66e41c143b8ef0a0f0c4f39451b5d03f5;hp=ae015d3031787ac7b2c00ab58a612f449a95d988;hpb=5fa478af40de0bb82e4870137deabeda31e6abc5;p=nethome.git

diff --git a/.bashrc b/.bashrc
index ae015d3..eb34f40 100644
--- a/.bashrc
+++ b/.bashrc
@@ -37,7 +37,7 @@ _bash_profile_addpath    -s CVSROOT "$HOME/pserver/cvs"
 _bash_profile_addpath    -s CVSROOT "$HOME/cvs"
 
 mkdir -p $HOME/lib/perl5	# otherwise CPAN will install to "$HOME/lib/site_perl" etc.
-for _perldir in $(eval "echo $HOME/lib/perl5{,/site_perl}$(
+for _perldir in $(eval "echo {/usr,$HOME}/lib/perl5{,/site_perl}$(
 	for perlvar in version archname;do
 		echo -n '{,/'
 		perl -V:"$perlvar"|cut -d "'" -f 2|tr -d '\n'
@@ -113,9 +113,16 @@ function mi { (
 	set -ex;cd "$1";while true;do test "$PWD" != "/";if [ -e configure.in -o -e Makefile.PL ];then break;fi;cd ..;done;make install;
 	); };export -f mi
 function ctags {(unset ctags;
-	if [ $# != 0 ];then ctags "$@";else
-		find -type f -a '(' -name "*.[chC]" -o -name "*.cc" -o -name "*.java" -o -name "*.p[lm]" ')'|ctags --file-tags -L -
+	if [ $# -ne 0 -a '(' $# -ne 1 -o "$1" '!=' "--c-types=+px" ')' ];then ctags "$@";else
+		find -type f -a '(' -false \
+						-o -name "*.[chC]" \
+						-o -name "*.cc"    \
+						-o -name "*.java"  \
+						-o -name "*.p[lm]" \
+						')' \
+				|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
@@ -128,3 +135,5 @@ if [ -f "$HOME/.bashrc.local" ];then source "$HOME/.bashrc.local";fi
 
 	unset _home_short_dotbashrc	# permit later reinitializations
 fi	# _home_short_dotbashrc
+
+true	# Prevent crash in '-e' mode