git://git.jankratochvil.net
/
nethome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restore Tab behavior to the older (or non-Debian?) Mutt.
[nethome.git]
/
.bashrc
diff --git
a/.bashrc
b/.bashrc
index
e1e845b
..
e072657
100644
(file)
--- a/
.bashrc
+++ b/
.bashrc
@@
-17,9
+17,10
@@
if [ -f /etc/bashrc ];then source /etc/bashrc;fi
function _bash_profile_addpath # <variablename>,<dirpathname>
{
function _bash_profile_addpath # <variablename>,<dirpathname>
{
- _OPTIND="$OPTIND"
+ local _varname _dirpathname _opt_f _opt_s
_opt_f=0;_opt_s=0
_opt_f=0;_opt_s=0
- OPTIND=1;while getopts fs got;do
+ unset OPTIND
+ while getopts fs got;do
case "$got" in
[fs]) eval "_opt_$got=1" ;;
*) return 1 ;;
case "$got" in
[fs]) eval "_opt_$got=1" ;;
*) return 1 ;;
@@
-35,8
+36,6
@@
function _bash_profile_addpath # <variablename>,<dirpathname>
eval "$_varname=\"$_dirpathname:\${$_varname}\""
fi
export "$_varname"
eval "$_varname=\"$_dirpathname:\${$_varname}\""
fi
export "$_varname"
- unset _varname _dirpathname _opt_f _opt_s
- OPTIND="$_OPTIND";unset _OPTIND
}
# Use reverse order of preferred directories:
}
# Use reverse order of preferred directories:
@@
-57,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"
_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
[ "`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"
# Do not "-f": We use /net !
_bash_profile_addpath PATH "$arch/bin"
_bash_profile_addpath PATH "$arch/OpenOffice.org"
@@
-120,7
+120,6
@@
export IGNOREEOF=10
export TMOUT=900
export EDITOR='vim'
[ -x /bin/less ] && export PAGER='/bin/less -MMh5cis'
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"
[ "$UID" -ne 0 ] && export PERL_MM_OPT="$PERL_MM_OPT PREFIX=$HOME"
for file in $HOME/.bookmarks.html;do
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
@@
-130,21
+129,30
@@
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}# '
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='\[\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
export HISTFILESIZE="$HISTSIZE"
export CVS_RSH="ssh"
fi
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
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
# Force strcoll() to sort case-sensitively! (empty/undef doesn't work)
export LC_COLLATE=C
+# Prevent: perl: warning: Setting locale failed.
+# due to LC_COLLATE=C and LC_ALL=(unset)
+export LC_ALL=C
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
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
@@
-157,7
+165,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
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]"*"; }' "$@";
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]"*"; }' "$@";
@@
-192,6
+202,7
@@
function revlines { perl -e 'my @r=();push @r,$_ while (<>);print pop @r while @
ulimit -c 0
set +H
shopt -s mailwarn
ulimit -c 0
set +H
shopt -s mailwarn
+unset OPTIND
if [ -f "$HOME/.bashrc.local" ];then source "$HOME/.bashrc.local";fi
if [ -f "$HOME/.bashrc.local" ];then source "$HOME/.bashrc.local";fi