Bootstrap.

[nethome.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 12f2142..27dd64e 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -84,7 +84,7 @@ _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 "/net/jsc-nfs.czech.sun.com/export/jscqa-local" "$HOME";do
+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"
@@ -118,7 +118,7 @@ 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 $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
 
@@ -143,6 +143,8 @@ alias cvsignoresallrm='cvsutil --ignores --workings --rm'
 alias rpmdb='rpm --define "_dbpath `echo /usr/lib/rpmdb/*/*`"'
 alias disass='objdump -D --target=binary --architecture=i386'
 alias cal='cal -m'
+alias vncreadonly='vncviewer -FullColor -Shared -ViewOnly'
+alias diff='diff -u'
 
 # '2>/dev/null' to prevent: unalias: x: not found
 unalias 2>/dev/null cp # -i
@@ -191,7 +193,7 @@ _selfabs=
 [ -r "$_selfabs" ] || unset _selfabs
 [ -n "$_selfabs" ] && export VIMINIT="source `echo "$_selfabs"|sed 's/[.]bashrc$/.vimrc/'`"
 
-export SOCKS5_SERVER=icsocks.holland.sun.com
+###export SOCKS5_SERVER=icsocks.holland.sun.com
 
 # Force English.
 unset LANG LANGUAGE `set|sed -n 's/^\(LC_[^=]*\)=.*$/\1/p'`
@@ -246,6 +248,8 @@ function debuginfo { if test -n "$*";then echo "$*";else cat;fi \
        |xargs rpm -qf|xargs rpmquery --qf '%{SOURCERPM}\n'|sed 's/-[^-]*-[^-]*[.]src[.]rpm$/-debuginfo/'|sort -u; }
 function ipcsrmall { ipcs|awk '/- Shared Memory/{x="-m"}/- Semaphore/{x="-s"}/^0x/{print "ipcrm "x" "$2}'; }
 function eog {(unset eog; touch /tmp/eog.$$;eog "$@" {,,,,,,,,,}/tmp/eog.$$;rm -f /tmp/eog.$$; );}; export -f eog
+function diffc { diff -u "$@"|grep -v '^\(Only in \|Binary files\)'; }; export -f diffc
+function diffi { diffc -X ~/.diffi.list "$@"; }; export -f diffi
 
 ulimit -S -c 0
 set +H