X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.bashrc;h=65f8e40d1dc8e5ca04d39156a908741d892fad34;hp=54395c53395cb41ad5816bc21824dc341f1c84a6;hb=7c9b10d7f5e3e34a6372699e6bc057c53c0d00e7;hpb=f8927eea8610a2c2e20349fb360d5a755813bd28 diff --git a/.bashrc b/.bashrc index 54395c5..65f8e40 100644 --- a/.bashrc +++ b/.bashrc @@ -1,25 +1,26 @@ if [ -n "$_home_short_dotbashrc_norc" -o "${TERM#norc-}" != "$TERM" ];then # We could get executed twice: - _home_short_dotbashrc_norc=true + export _home_short_dotbashrc_norc=true # Do not use $TZ as Solaris sshd(8) does not propagate it. # Be aware you must use 'ssh -t' to propagate $TERM otherwise '=dumb'. export TERM="${TERM#norc-}" - _home_short_dotbashrc=true + export _home_short_dotbashrc=true fi if [ -z "$_home_short_dotbashrc" ];then _home_short_dotbashrc=true # $TERM gets restored to its 'norc-' state after ~/.bashrc - # alias norc='TERM="norc-$TERM" ssh -t $USER@localhost "cd $PWD; TERM=$TERM;"' - function norc { TERM="norc-$TERM" ssh -t $USER@localhost "cd $PWD; TERM=$TERM;" "$@"; }; export -f norc + # alias norc='TERM="norc-$TERM" ssh -t -o 'NoHostAuthenticationForLocalhost yes' $USER@localhost "cd $PWD; TERM=$TERM;"' + function norc { TERM="norc-$TERM" ssh -t -o 'NoHostAuthenticationForLocalhost yes' $USER@localhost "cd $PWD; TERM=$TERM;" "$@"; }; export -f norc if [ -f /etc/bashrc ];then source /etc/bashrc;fi function _bash_profile_addpath # , { - _OPTIND="$OPTIND" + local _varname _dirpathname _opt_f _opt_s _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 ;; @@ -35,21 +36,20 @@ function _bash_profile_addpath # , eval "$_varname=\"$_dirpathname:\${$_varname}\"" fi export "$_varname" - unset _varname _dirpathname _opt_f _opt_s - OPTIND="$_OPTIND";unset _OPTIND } # Use reverse order of preferred directories: # gid(1) dependency on: /opt/sfw/bin # EUID="`id -u 2>/dev/null || /usr/xpg4/bin/id -u 2>/dev/null || gid -u`" +_bash_profile_addpath -f PATH "/opt/SUNWspro/bin" _bash_profile_addpath -f PATH "/usr/dist/exe" -_bash_profile_addpath -f PATH "/share/ProductivityTools/exe" _bash_profile_addpath -f PATH "/sbin" _bash_profile_addpath -f PATH "/usr/sbin" _bash_profile_addpath -f PATH "/opt/sfw/bin" -_bash_profile_addpath -f PATH "/usr/local/sbin" -_bash_profile_addpath -f PATH "/usr/local/bin" +[ -x $HOME/bin/ProductivityTools-check ] && eval `$HOME/bin/ProductivityTools-check` +[ -n "$PATH_PRODUCTIVITY_TOOLS" ] && _bash_profile_addpath -f PATH "$PATH_PRODUCTIVITY_TOOLS" [ $EUID -eq 0 ] && _bash_profile_addpath -f PATH "/usr/local/sbin" +_bash_profile_addpath -f PATH "/usr/local/bin" _bash_profile_addpath -f LD_LIBRARY_PATH "/opt/sfw/lib" _bash_profile_addpath -f MANPATH "/usr/X11R6/man" _bash_profile_addpath -f MANPATH "/usr/share/man" @@ -108,6 +108,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 @@ -118,8 +119,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" @@ -127,9 +128,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 @@ -154,7 +156,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 );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 if [ -f "$HOME/.bashrc.local" ];then source "$HOME/.bashrc.local";fi