Start using unified e-mail address.

[nethome.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 35a00a6..e1e845b 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -42,6 +42,7 @@ function _bash_profile_addpath        # <variablename>,<dirpathname>
 # 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            "/sbin"
 _bash_profile_addpath -f PATH            "/usr/sbin"
@@ -108,6 +109,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,7 +121,8 @@ 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"
@@ -186,48 +189,6 @@ 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