Use automounted $HOME instead of static mount.

[nethome.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 95a48dc..54395c5 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -22,7 +22,7 @@ function _bash_profile_addpath        # <variablename>,<dirpathname>
        OPTIND=1;while getopts fs got;do
                case "$got" in
                        [fs]) eval "_opt_$got=1" ;;
-                       *) exit 1 ;;
+                       *) return 1 ;;
                        esac
                done
        eval "_varname=\"\$$[$OPTIND+0]\""
@@ -42,11 +42,11 @@ 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            "/usr/dist/exe"
+_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            "/usr/dist/exe"
 _bash_profile_addpath -f PATH            "/opt/sfw/bin"
-_bash_profile_addpath -f PATH            "/share/ProductivityTools/exe"
 _bash_profile_addpath -f PATH            "/usr/local/sbin"
 _bash_profile_addpath -f PATH            "/usr/local/bin"
 [ $EUID -eq 0 ] && _bash_profile_addpath -f PATH "/usr/local/sbin"
@@ -54,20 +54,25 @@ _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`" = "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 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"
                _bash_profile_addpath MANPATH         "$arch/man"
                done
        done
 _bash_profile_addpath -f -s CVSROOT "short@vellum.cz:/home/short/pserver/cvs"  # default
+[ -n "$JAVA_HOME" ] && _bash_profile_addpath PATH "$JAVA_HOME/bin"
 _bash_profile_addpath    -s CVSROOT "$HOME/pserver/cvs"
 _bash_profile_addpath    -s CVSROOT "$HOME/cvs"
-_bash_profile_addpath    -s JAVA_HOME "/usr/java"
 _bash_profile_addpath    -s ANT_HOME "/usr/local/ant"
 
 mkdir -p $HOME/lib/perl5       # otherwise CPAN will install to "$HOME/lib/site_perl" etc.
@@ -82,16 +87,11 @@ for _perldir in $(eval "echo {/usr,$HOME}/lib/perl5{,/site_perl}$(
        done
 unset _perldir
 
-### HiveMind_2.0_ga_u6.tar.gz/HiveMindGettingStarted.pdf:26
-_bash_profile_addpath -f PATH "/opt/SUNWhvmd/framework/sparc-sun-solaris/bin"
-_bash_profile_addpath -f LD_LIBRARY_PATH "/opt/SUNWhvmd/framework/sparc-sun-solaris/lib"
-_bash_profile_addpath -f -s HM_PKG_BASE_DIR "/opt/SUNWhvmd"
-_bash_profile_addpath -f -s HM_BASE_DIRS "/opt/SUNWhvmd/examples/tasks"
-_bash_profile_addpath -f CLASSPATH "/opt/SUNWhvmd/launcher/GUI/classes/launcher.jar"
-
 unset -f _bash_profile_addpath
 
 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
 
@@ -126,7 +126,7 @@ for file in $HOME/.bookmarks.html;do
        done
 export GREP_OPTIONS="--binary-files=without-match --directories=skip"
 if [ -n "$PS1" ];then  # set only in interactive sessions
-       export PS1='[bash]${USER}@${HOSTNAME}:${PWD}# '
+       export PS1='[bash]${LOGNAME}@${HOSTNAME}:${PWD}# '
        # kbd_mode -u   # utf-8
        # export PS1='\[\017\033%G\]'"$PS1"     # \017=std charmap, \033%G=utf-8
        export PS1='\[\017\]'"$PS1"     # \017=std charmap
@@ -194,7 +194,7 @@ function revlines { perl -e 'my @r=();push @r,$_ while (<>);print pop @r while @
                case "$got" in
                        [qalf]) eval "_opt_$got=1" ;;
                        v) ;;
-                       *) exit 1 ;;
+                       *) return 1 ;;
                        esac
                done
        shift $[$OPTIND-1]