Bootstrap.

[nethome.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 60dadf6..27dd64e 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -30,11 +30,12 @@ fi
 
 if [ -f /etc/bashrc ];then source /etc/bashrc;fi
 
+_bash_profile_addpath_fini=""
 function _bash_profile_addpath # <variablename>,<dirpathname>
 {
        local _varname _varval _varvalold _dirpathname _opt_f _opt_s
        _opt_f=0;_opt_s=0
-       unset OPTIND
+       unset -v OPTIND
        while getopts fs got;do
                case "$got" in
                        [fs]) eval "_opt_$got=1" ;;
@@ -47,17 +48,21 @@ function _bash_profile_addpath      # <variablename>,<dirpathname>
        if [ $_opt_s = 1 -o -z "`eval "echo \\${$_varname}"`" ];then
                eval "$_varname='$_dirpathname'"
        else
+               # We want to prevent duplicates due to .bashrc reentrancy across fork(2)s. It is array!
+               _bash_profile_addpath_fini="$_bash_profile_addpath_fini $_varname"
                # We want to override any original directories, place dirpathname first!
-               # We want to prevent duplicates due to .bashrc reentrancy across fork(2)s.
-               eval "_varval=\":\${$_varname}:\""
-               until [ "$_varval" = "$_varvalold" ];do
-                       _varvalold="$_varval"
-                       eval "_varval=\"$(echo "$_varval"|sed "s#:$_dirpathname:#:#g")\""
-               done
-               eval "$_varname=\"$_dirpathname$(echo "$_varval"|sed "s#:\$##g")\""
+               eval "$_varname=\"$_dirpathname:\${$_varname}\""
        fi
        export "$_varname"
 }
+function _bash_profile_addpath_fini
+{
+       local _varname
+       for _varname in `echo "$_bash_profile_addpath_fini"|tr ' ' '\n'|sort -u`;do
+               eval "$_varname=\"`eval $(echo "echo \"\\$$_varname\"")|awk -v RS=':' '/[^\n]/{if (!x[$0]++) e=e":"$0;}END{print substr(e,2)}'`\""
+               done
+       unset -v _bash_profile_addpath_fini
+}
 
 # Use reverse order of preferred directories:
 # gid(1) dependency on: /opt/sfw/bin
@@ -79,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"
@@ -108,10 +113,12 @@ for _perldir in $(eval "echo {/usr,$HOME}{/lib{,64}/perl{,5},/share/perl}{,/site
 unset _perldir
 
 unset -f _bash_profile_addpath
+_bash_profile_addpath_fini
+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
 
@@ -136,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
@@ -177,9 +186,14 @@ if grep 2>/dev/null -q '^..............:0C38 00000000:0000 0A ' /proc/net/tcp;th
        export https_proxy=http://127.0.0.1:3128/
        export   ftp_proxy=http://127.0.0.1:3128/
 fi
-export VIMINIT="source `echo "$BASH_SOURCE"|sed 's/[.]bashrc$/.vimrc/'`"
+_selfabs=
+[ "$_selfabs" = "${_selfabs#/}" ] && _selfabs="$BASH_SOURCE"
+[ "$_selfabs" = "${_selfabs#/}" ] && _selfabs="$BASH_ENV"
+[ "$_selfabs" = "${_selfabs#/}" ] && _selfabs="$PWD/.bashrc"
+[ -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'`
@@ -234,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
@@ -245,7 +261,8 @@ if [ -f "$HOME/.bashrc.local" ];then source "$HOME/.bashrc.local";fi
 # Interactive part:
 for key in $HOME/.ssh/id_dsa;do
        [ -r "$key" ] || continue
-       [ -n "$SSH_TTY" ] && continue
+       # Do not: [ -n "$SSH_TTY" ] && continue
+       # as we may want foreign SSH keys too.
 
        agenteval=/tmp/.$USER.ssh-agent.eval
        if lockfile -1 -r 3 -l 10 -s 1 $agenteval.lock;then