X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.bashrc;h=eddb9fa3dfe3e11e9a3961875eb720cdbb548009;hp=570f1ad837875720140ce199cb9a4fa767f70012;hb=54566b7e49988b19d09e5072bb134247fef1b3ba;hpb=1073f4b16912de570250fc178a3a4f4127925e0c

diff --git a/.bashrc b/.bashrc
index 570f1ad..eddb9fa 100644
--- a/.bashrc
+++ b/.bashrc
@@ -3,34 +3,48 @@ if [ -z "$_home_short_dotbashrc" ];then
 
 if [ -f /etc/bashrc ];then source /etc/bashrc;fi
 
-function _bash_profile_addpath	# variable,dirpathname
+function _bash_profile_addpath	# <variablename>,<dirpathname>
 {
-	if [ '!' -d "$2" ];then return;fi
-	if [ -n "$3" -o -z "`eval "echo \\${$1}"`" ];then
-		eval "$1='$2'"
+	_OPTIND="$OPTIND"
+	_opt_f=0;_opt_s=0
+	OPTIND=1;while getopts fs got;do
+		case "$got" in
+			[fs]) eval "_opt_$got=1" ;;
+			*) exit 1 ;;
+			esac
+		done
+	eval "_varname=\"\$$[$OPTIND+0]\""
+	eval "_dirpathname=\"\$$[$OPTIND+1]\""
+	if [ $_opt_f = 0 -a '!' -d "$_dirpathname" ];then return;fi
+	if [ $_opt_s = 1 -o -z "`eval "echo \\${$_varname}"`" ];then
+		eval "$_varname='$_dirpathname'"
 	else
 		# we want to override any original directories, place dirpathname first!
-		eval "$1=\"$2:\${$1}\""
+		eval "$_varname=\"$_dirpathname:\${$_varname}\""
 	fi
-	export "$1"
+	export "$_varname"
+	unset _varname _dirpathname _opt_f _opt_s
+	OPTIND="$_OPTIND";unset _OPTIND
 }
 
-_bash_profile_addpath PATH            "$HOME/bin"
-_bash_profile_addpath PATH            "$HOME/sbin"
-_bash_profile_addpath LD_LIBRARY_PATH "$HOME/lib"
-_bash_profile_addpath MANPATH         "$HOME/man"
+_bash_profile_addpath -f PATH            "$HOME/bin"
+_bash_profile_addpath -f PATH            "$HOME/sbin"
+_bash_profile_addpath -f LD_LIBRARY_PATH "$HOME/lib"
+_bash_profile_addpath -f MANPATH         "$HOME/man"
 
-_bash_profile_addpath CVSROOT         "$HOME/cvs" single
-_bash_profile_addpath CVSROOT         "$HOME/pserver/cvs" single
+_bash_profile_addpath -f -s CVSROOT "short@vellum.cz:/home/short/pserver/cvs"	# default
+_bash_profile_addpath    -s CVSROOT "$HOME/pserver/cvs"
+_bash_profile_addpath    -s CVSROOT "$HOME/cvs"
 
-for _perldir in $(eval "echo $HOME/lib/perl5/site_perl$(
+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 perlvar in version archname;do
 		echo -n '{,/'
 		perl -V:"$perlvar"|cut -d "'" -f 2|tr -d '\n'
 		echo -n '}'
 		done
 	)");do
-	_bash_profile_addpath PERLLIB "$_perldir"
+	_bash_profile_addpath -f PERLLIB "$_perldir"
 	done
 unset _perldir
 
@@ -59,10 +73,14 @@ export IGNOREEOF=10
 export TMOUT=900
 export EDITOR='vim'
 export LC_CTYPE=cs_CZ.ISO-8859-2
-export PERL_MM_OPT="PREFIX=$HOME"
+export PERL_MM_OPT="PERL=$HOME/bin/perlilib PREFIX=$HOME"
 export WWW_HOME="file:///home/short/.bookmarks.html"
 export GREP_OPTIONS="--binary-files=without-match --directories=skip"
-[ -n "$PS1" ] && export PS1="`echo -en '\017'`$PS1"	# set only in interactive sessions
+if [ -n "$PS1" ];then	# set only in interactive sessions
+	# kbd_mode -u	# utf-8
+	# export PS1='\[\017\033%G\]'"$PS1"	# \017=std charmap, \033%G=utf-8
+	export PS1='\[\017\]'"$PS1"	# \017=std charmap
+	fi
 export MINICOM="-m -c on"	# metakeys+color
 export HISTSIZE=100000
 export HISTFILESIZE="$HISTSIZE"
@@ -78,13 +96,13 @@ function cvsupdatei { cvs update "$@" 2>&1|pipebuf -q|grep -v '^?'|less; }; expo
 
 function wclines { awk '{x[$0]++}END{for (i in x) print x[i]"\t"i}'; }; export -f wclines
 function ulimitme { ulimit -m 100000 -d 150000 -v 200000; }; export -f ulimitme
-function grep { ( ulimitme; `which grep` "$@"; ); }; export -f grep
+function grep {(unset grep; ( ulimitme; grep "$@"; ); );}; export -f grep
 function finame { find . -false `
 	awk </dev/null 'BEGIN{ for (i=1;i<ARGC;i++) print " -o -iname *"ARGV[i]"*"; }' "$@";
 	`; }; export -f finame
 function mkcd { mkdir -p "$1"; cd "$1"; }; export -f mkcd
 function pushdmk { mkdir -p "$1"; pushd "$1"; }; export -f pushdmk
-function rsync { `which rsync` -v -e ssh --progress --stats --partial --block-size=512 "$@"; }; export -f rsync
+function rsync {(unset rsync; rsync -v -e ssh --progress --stats --partial --block-size=512 "$@"; );}; export -f rsync
 function tohex { od -An -txC /tmp/out|tr -d '\n '|tr 'a-f' 'A-F';echo; }; export -f tohex
 function edall {
 	find -type f|while read -r i;do
@@ -94,10 +112,20 @@ function edall {
 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 {
-	if [ $# != 0 ];then `which ctags` "$@";else
-		rm -f tags;find -type f -a '(' -name "*.[chC]" -o -name "*.cc" -o -name "*.java" ')'|xargs `which ctags` -a --file-tags
-	fi; }; export -f ctags
+function ctags {(unset ctags;
+	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
 
 ulimit -c 0
 set +H