X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=.bashrc;h=432ac97ea25484c22f01ba331c9a640504a2adb4;hb=3e9d1b034c06f59cfe1a4dfc1c2dff304c70a5f2;hp=095536bbba557233c5dcc3ca47ceb807f8320637;hpb=15632506b7431d35f418fef404b194aa430a9215;p=nethome.git

diff --git a/.bashrc b/.bashrc
index 095536b..432ac97 100644
--- a/.bashrc
+++ b/.bashrc
@@ -17,9 +17,12 @@ if [ -f /etc/bashrc ];then source /etc/bashrc;fi
 
 function _bash_profile_addpath	# <variablename>,<dirpathname>
 {
-	_OPTIND="$OPTIND"
+	# FIXME: local OPTIND
+	# see also: <20041223083747.GA9955@kobhome.dyn.jankratochvil.net>
+	unset OPTIND
+	local _varname _dirpathname _opt_f _opt_s
 	_opt_f=0;_opt_s=0
-	OPTIND=1;while getopts fs got;do
+	while getopts fs got;do
 		case "$got" in
 			[fs]) eval "_opt_$got=1" ;;
 			*) return 1 ;;
@@ -35,8 +38,6 @@ function _bash_profile_addpath	# <variablename>,<dirpathname>
 		eval "$_varname=\"$_dirpathname:\${$_varname}\""
 	fi
 	export "$_varname"
-	unset _varname _dirpathname _opt_f _opt_s
-	OPTIND="$_OPTIND";unset _OPTIND
 }
 
 # Use reverse order of preferred directories:
@@ -109,6 +110,7 @@ alias cvsignoresall='cvsutil --ignores --workings --print'
 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'
 
 weberr="/var/log/httpd/error/klokan.error_log"
 if [ -f "$weberr" ];then alias weberr='tail "$weberr"';fi
@@ -119,8 +121,8 @@ export IGNOREEOF=10
 export TMOUT=900
 export EDITOR='vim'
 [ -x /bin/less ] && export PAGER='/bin/less -MMh5cis'
-[ "`uname`" = "SunOS" ] || export LC_CTYPE=cs_CZ.ISO-8859-2
-export PERL_MM_OPT="PERL=$HOME/bin/perlilib PREFIX=$HOME"
+export PERL_MM_OPT="PERL=$HOME/bin/perlilib"
+[ "$UID" -ne 0 ] && export PERL_MM_OPT="$PERL_MM_OPT PREFIX=$HOME"
 for file in $HOME/.bookmarks.html;do
 	export WWW_HOME="file://$HOME/"
 	[ -r $file ] && export WWW_HOME="file://$file"
@@ -128,9 +130,10 @@ for file in $HOME/.bookmarks.html;do
 export GREP_OPTIONS="--binary-files=without-match --directories=skip"
 if [ -n "$PS1" ];then	# set only in interactive sessions
 	export PS1='[bash]${LOGNAME}@${HOSTNAME}:${PWD}# '
-	# 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
+	export PS1='\[\033%G\]'"$PS1"	# \033%G=utf-8
+	# Do not: kbd_mode -u # utf-8
+	# as it breaks keyboard state in X and it is not permitted for non-root.
 	fi
 export MINICOM="-m -c on"	# metakeys+color
 export HISTSIZE=100000
@@ -155,7 +158,9 @@ export ULIMITME_OPTS=""
 for i in "-m 100000" "-d 150000" "-v 200000";do
 	(ulimit $i 2>/dev/null) && ULIMITME_OPTS="$ULIMITME_OPTS $i"
 	done
-function ulimitme { ulimit $ULIMITME_OPTS; }; export -f ulimitme
+# Prevent: ulimit:  -m 100000 -d 150000 -v 200000: invalid number
+# by forcing our known $IFS value; eval(1) is needed to take $IFS to effect:
+function ulimitme { IFS=" " eval "ulimit $ULIMITME_OPTS"; }; export -f ulimitme
 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]"*"; }' "$@";
@@ -187,51 +192,10 @@ function cpan {(unset cpan; if [ $# = 0 ];then cpan;else perl -MCPAN -e "install
 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
 
-[ "`uname`" = "SunOS" ] && function rpm
-{
-	_OPTIND="$OPTIND"
-	_opt_q=0;_opt_a=0;_opt_l=0;_opt_f=0
-	OPTIND=1;while getopts qalfv got;do
-		case "$got" in
-			[qalf]) eval "_opt_$got=1" ;;
-			v) ;;
-			*) return 1 ;;
-			esac
-		done
-	shift $[$OPTIND-1]
-	if [ $_opt_q = 0 ];then echo >&2 "rpm: No -q!";return 1;fi
-	if [ $_opt_a = 1 -a $# != 0 ];then echo >&2 "rpm: -a but some arguments!";return 1;fi
-	if [ $_opt_a = 0 -a $#  = 0 ];then echo >&2 "rpm: -a but no arguments!";return 1;fi
-	if [ $_opt_l = 1 -a $_opt_f  = 1 ];then echo >&2 "rpm: Both -l and -f given!";return 1;fi
-	if [ $_opt_f = 1 ];then
-		for file in "$@";do
-			if [ "$file" = "${file#/}" ];then
-				file="$PWD/$file"
-			fi
-			_out="`pkgchk -l -p "$file"`"
-			if [ -z "$_out" ];then
-				echo >&2 "file $file is not owned by any package!"
-			else
-				echo -n "$_out"|awk '
-						/^[^\t]/{p=0}
-						/^Referenced by the following packages:$/{p=1}
-						/^\t/{if (p) { print; } }
-						'
-			fi
-			unset _out
-		done
-	elif [ $_opt_l = 1 ];then
-		pkgchk -l `pkginfo "$@"|awk '{print $2}'`|sed -n 's/^Pathname: //p'
-	else
-		pkginfo "$@"|awk '{print $2}'
-	fi
-	unset _opt_q _opt_a _opt_l _opt_f
-	OPTIND="$_OPTIND";unset _OPTIND
-} && export -f rpm
-
 ulimit -c 0
 set +H
 shopt -s mailwarn
+unset OPTIND	# FIXME; see also: <20041223083747.GA9955@kobhome.dyn.jankratochvil.net>
 
 if [ -f "$HOME/.bashrc.local" ];then source "$HOME/.bashrc.local";fi