X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.bashrc;h=3176043ae6199fd8018a1648d6459c41377c745b;hp=432ac97ea25484c22f01ba331c9a640504a2adb4;hb=909fad1205e782a3b58c43b97525662e3438c744;hpb=932971463e1061fda2d7d069d694bddeae359897

diff --git a/.bashrc b/.bashrc
index 432ac97..3176043 100644
--- a/.bashrc
+++ b/.bashrc
@@ -17,11 +17,9 @@ if [ -f /etc/bashrc ];then source /etc/bashrc;fi
 
 function _bash_profile_addpath	# <variablename>,<dirpathname>
 {
-	# 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
+	unset OPTIND
 	while getopts fs got;do
 		case "$got" in
 			[fs]) eval "_opt_$got=1" ;;
@@ -58,9 +56,10 @@ _bash_profile_addpath -f MANPATH         "/usr/share/man"
 _bash_profile_addpath -f MANPATH         "/usr/local/man"
 _bash_profile_addpath -s JAVA_HOME       "/usr/java"
 _bash_profile_addpath -s JAVA_HOME       "/usr/local/java"
+uname_p="`uname -p 2>/dev/null || uname -m`"
 [ "`uname`" = "SunOS" ] && _bash_profile_addpath -f LD_LIBRARY_PATH "$HOME/Netscape/dist/lib"
 for family in "/net/jsc-nfs.czech.sun.com/export/jscqa-local" "$HOME";do
-	for arch in "$family" $family/`uname -p`;do
+	for arch in "$family" $family/$uname_p;do
 		# Do not "-f": We use /net !
 		_bash_profile_addpath PATH            "$arch/bin"
 		_bash_profile_addpath PATH            "$arch/OpenOffice.org"
@@ -77,8 +76,11 @@ _bash_profile_addpath    -s CVSROOT "$HOME/pserver/cvs"
 _bash_profile_addpath    -s CVSROOT "$HOME/cvs"
 _bash_profile_addpath    -s ANT_HOME "/usr/local/ant"
 
+# /share/perl for Debian
+# /lib/perl for Debian
+# /lib/perl5 for Fedora Core
 mkdir -p $HOME/lib/perl5	# otherwise CPAN will install to "$HOME/lib/site_perl" etc.
-for _perldir in $(eval "echo {/usr,$HOME}/lib/perl5{,/site_perl}$(
+for _perldir in $(eval "echo {/usr,$HOME}{/lib/perl5,/share/perl,/lib/perl}{,/site_perl}$(
 	for perlvar in version archname;do
 		echo -n '{,/'
 		perl -V:"$perlvar"|cut -d "'" -f 2|tr -d '\n'
@@ -112,13 +114,15 @@ 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
-weblog="/var/log/httpd/klokan.access_log"
-if [ -f "$weblog" ];then alias weblog='tail -n 20000 "$weblog"|grep "\\(~\\|%7[eE]\\)short"';fi
+unalias cp	# -i
+unalias mv	# -i
+unalias rm	# -i
+unalias df	# -h
+unalias du	# -h
 
 export IGNOREEOF=10
-export TMOUT=900
+# '2>/dev/null' to prevent: TMOUT: readonly variable
+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"
@@ -139,13 +143,22 @@ export MINICOM="-m -c on"	# metakeys+color
 export HISTSIZE=100000
 export HISTFILESIZE="$HISTSIZE"
 export CVS_RSH="ssh"
-grep -w "$TERM" /etc/termcap >/dev/null || export TERM=vt220
-uname_p="`uname -p`"; [ "$TERM" = vt220 -a "${uname_p%86}" != "$uname_p" ] && export TERM=linux
+# 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
 
 export SOCKS5_SERVER=icsocks.holland.sun.com
 
+# Force English.
+unset LANG LANGUAGE `set|sed -n 's/^\(LC_[^=]*\)=.*$/\1/p'`
+export LANG=en_US.UTF-8
 # Force strcoll() to sort case-sensitively! (empty/undef doesn't work)
 export LC_COLLATE=C
+# Do not: # Prevent: perl: warning: Setting locale failed.
+#         # due to LC_COLLATE=C and LC_ALL=(unset)
+#         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
@@ -195,7 +208,7 @@ function revlines { perl -e 'my @r=();push @r,$_ while (<>);print pop @r while @
 ulimit -c 0
 set +H
 shopt -s mailwarn
-unset OPTIND	# FIXME; see also: <20041223083747.GA9955@kobhome.dyn.jankratochvil.net>
+unset OPTIND
 
 if [ -f "$HOME/.bashrc.local" ];then source "$HOME/.bashrc.local";fi