Fixed EUID detection on Solaris.

[nethome.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 24121d4..3bd2db5 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -31,9 +31,10 @@ _bash_profile_addpath -f PATH            "$HOME/bin"
 _bash_profile_addpath -f PATH            "/share/ProductivityTools/exe"
 _bash_profile_addpath -f PATH            "/opt/sfw/bin"
 # gid(1) dependency on: /opt/sfw/bin
-[ `id -u 2>/dev/null || gid -u` -eq 0 ] && _bash_profile_addpath -f PATH "$HOME/sbin"
+# 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            "/usr/local/bin"
-[ `id -u 2>/dev/null || gid -u` -eq 0 ] && _bash_profile_addpath -f PATH "/usr/local/sbin"
+[ $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"
@@ -67,7 +68,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 >/dev/null && alias $i=g$i
+       which g$i | grep '^/' >/dev/null && alias $i=g$i
        done
 
 alias ls='ls -bF'
@@ -107,7 +108,8 @@ export MINICOM="-m -c on"   # metakeys+color
 export HISTSIZE=100000
 export HISTFILESIZE="$HISTSIZE"
 export CVS_RSH="ssh"
-grep -qw "$TERM" /etc/termcap || export TERM=vt220
+grep -w "$TERM" /etc/termcap >/dev/null || export TERM=vt220
+export SOCKS5_SERVER=icsocks.holland.sun.com
 
 # Force strcoll() to sort case-sensitively! (empty/undef doesn't work)
 export LC_COLLATE=C