From 8cef03e6d824a93431fb82282c2451675abf8d78 Mon Sep 17 00:00:00 2001 From: short <> Date: Mon, 19 Jan 2004 21:45:22 +0000 Subject: [PATCH] Solaris fixes. ulimit(1) fix. --- .bashrc | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/.bashrc b/.bashrc index 3bd2db5..52a6b55 100644 --- a/.bashrc +++ b/.bashrc @@ -27,19 +27,27 @@ function _bash_profile_addpath # , OPTIND="$_OPTIND";unset _OPTIND } -_bash_profile_addpath -f PATH "$HOME/bin" -_bash_profile_addpath -f PATH "/share/ProductivityTools/exe" -_bash_profile_addpath -f PATH "/opt/sfw/bin" +# 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`" -[ $EUID -eq 0 ] && _bash_profile_addpath -f PATH "$HOME/sbin" +_bash_profile_addpath -f PATH "/sbin" +_bash_profile_addpath -f PATH "/usr/sbin" +_bash_profile_addpath -f PATH "/usr/dist/exe" +_bash_profile_addpath -f PATH "/opt/sfw/bin" +_bash_profile_addpath -f PATH "/share/ProductivityTools/exe" +_bash_profile_addpath -f PATH "/usr/local/sbin" _bash_profile_addpath -f PATH "/usr/local/bin" [ $EUID -eq 0 ] && _bash_profile_addpath -f PATH "/usr/local/sbin" -_bash_profile_addpath -f LD_LIBRARY_PATH "$HOME/lib" _bash_profile_addpath -f LD_LIBRARY_PATH "/opt/sfw/lib" -_bash_profile_addpath -f MANPATH "$HOME/man" -_bash_profile_addpath -f MANPATH "/usr/local/man" _bash_profile_addpath -f MANPATH "/usr/share/man" +_bash_profile_addpath -f MANPATH "/usr/local/man" +_bash_profile_addpath -f LD_LIBRARY_PATH "$HOME/Netscape/dist/lib" +for arch in "" /`uname -p`;do + _bash_profile_addpath -f PATH "$HOME$arch/bin" + [ $EUID -eq 0 ] && _bash_profile_addpath -f PATH "$HOME$arch/sbin" + _bash_profile_addpath -f LD_LIBRARY_PATH "$HOME$arch/lib" + _bash_profile_addpath -f MANPATH "$HOME$arch/man" + done _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" @@ -68,7 +76,7 @@ _bash_profile_addpath -f CLASSPATH "/opt/SUNWhvmd/launcher/GUI/classes/launcher. unset -f _bash_profile_addpath for i in tar ls find cp mv ln md5sum du grep ar chown chmod tail;do - which g$i | grep '^/' >/dev/null && alias $i=g$i + which g$i 2>/dev/null | grep '^/' >/dev/null && alias $i=g$i done alias ls='ls -bF' @@ -93,13 +101,16 @@ if [ -f "$weblog" ];then alias weblog='tail -n 20000 "$weblog"|grep "\\(~\\|%7[e export IGNOREEOF=10 export TMOUT=900 export EDITOR='vim' -export PAGER='/bin/less -MMh5cis' +[ -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 WWW_HOME="file:///home/short/.bookmarks.html" +for file in $HOME/.bookmarks.html;do + export WWW_HOME="file://$HOME/" + [ -r $file ] && export WWW_HOME="file://$file" + done export GREP_OPTIONS="--binary-files=without-match --directories=skip" if [ -n "$PS1" ];then # set only in interactive sessions - export PS1="${USER}[bash]@`/usr/bin/uname -n`# " + export PS1="${USER}[bash]@`uname -n`# " # 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 @@ -123,7 +134,7 @@ function wclines { awk '{x[$0]++}END{for (i in x) print x[i]"\t"i}'; }; export - # SunOS does not support "-m" export ULIMITME_OPTS="" for i in "-m 100000" "-d 150000" "-v 200000";do - ulimit $i 2>/dev/null && ULIMITME_OPTS="$ULIMITME_OPTS $i" + (ulimit $i 2>/dev/null) && ULIMITME_OPTS="$ULIMITME_OPTS $i" done function ulimitme { ulimit $ULIMITME_OPTS; }; export -f ulimitme function grep {(unset grep; ( ulimitme; grep "$@"; ); );}; export -f grep -- 1.8.3.1