From: lace <>
Date: Sat, 22 Dec 2007 17:34:24 +0000 (+0000)
Subject: Remove a lot of the Sun/Solaris crap.
X-Git-Url: http://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=bd1a121ca2af7762f4ea753355b7d280a218d7f4

Remove a lot of the Sun/Solaris crap.
---

diff --git a/.bashrc b/.bashrc
index 669e0b3..9729af5 100644
--- a/.bashrc
+++ b/.bashrc
@@ -68,29 +68,20 @@ function _bash_profile_addpath_fini
 # 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"
-_bash_profile_addpath -f PATH            "/opt/sfw/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"
 _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 $HOME;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"
-		_bash_profile_addpath PATH            "$arch/forte4j/extbin"
 		_bash_profile_addpath -s JAVA_HOME    "$arch/java"
 		[ $EUID -eq 0 ] && _bash_profile_addpath PATH "$arch/sbin"
 		_bash_profile_addpath LD_LIBRARY_PATH "$arch/lib"
@@ -120,7 +111,6 @@ unset -f _bash_profile_addpath_fini
 
 for i in tar ls find cp mv ln md5sum du grep ar chown chmod tail;do
 	# Prevent g$i from system directory overriding customized $i binary
-	###which $i 2>/dev/null | grep /net/jsc-nfs.czech.sun.com/export/jscqa-local/ >/dev/null && continue
 	which g$i 2>/dev/null | grep '^/' >/dev/null && alias $i=g$i
 	done
 
@@ -147,7 +137,6 @@ alias cvsignoresrmall='cvsutil --ignores --workings --rm'
 alias cvsignoresallrm='cvsutil --ignores --workings --rm'
 alias svnignoresall='svn status |sed -n "s/^[?]      //p"'
 alias svnignoresallrm='svn status |sed -n "s/^[?]      //p"|tr "\n" "\0"|xargs -0 rm -rf'
-[ "`uname`" = "SunOS" -a -x $HOME/bin/rpm-by-pkg ] && alias rpm='rpm-by-pkg'
 alias disass='objdump -D --target=binary --architecture=i386'
 alias cal='cal -m'
 alias vncreadonly='vncviewer -FullColor -Shared -ViewOnly'
@@ -206,8 +195,6 @@ _selfabs=
 [ -r "$_selfabs" ] || unset _selfabs
 [ -n "$_selfabs" ] && export VIMINIT="source `echo "$_selfabs"|sed 's/[.]bashrc$/.vimrc/'`"
 
-###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