X-Git-Url: http://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.bashrc;h=1111750d400bd12dbe9ed4726253f4f35e8547ae;hp=0af4141515f01a8ccf71a14183eab781d4b4822d;hb=a55109a700ac506e0216822f0cb9030b9d23c499;hpb=989fd0f519c85076184a87d777af40d44b5fdef0

diff --git a/.bashrc b/.bashrc
index 0af4141..1111750 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,17 +1,17 @@
 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
 
@@ -42,14 +42,15 @@ 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"
-[ "`uname`" = "SunOS" ] && _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 +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
@@ -186,48 +188,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