From fb884cc4ae59f197e2ba64eed826974b44eadfc4 Mon Sep 17 00:00:00 2001 From: short <> Date: Thu, 15 Apr 2004 09:38:44 +0000 Subject: [PATCH] Exchange priorities of Sun directories in $PATH. +improve $JAVA_HOME settings +OpenOffice.org $PATH -HiveMind settings - They are pretty confusing when dealing with non-standard HiveMind packagings. $PS1 made compatible with Solaris. --- .bashrc | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.bashrc b/.bashrc index 7cc89f9..dfc45d5 100644 --- a/.bashrc +++ b/.bashrc @@ -42,11 +42,11 @@ function _bash_profile_addpath # , # 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,13 +87,6 @@ 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 @@ -126,7 +124,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 -- 1.8.3.1