Fixed PS1 prompt.

[nethome.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 618266d..9844dd4 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -1,5 +1,17 @@
+if [ -n "$_home_short_dotbashrc_norc" -o "${TERM#norc-}" != "$TERM" ];then
+       # We could get executed twice:
+       _home_short_dotbashrc_norc=true
+       # Do not use $TZ as Solaris sshd(8) does not propagate it.
+       # Be aware you must use 'ssh -t' to propagate $TERM otherwise '=dumb'.
+       export TERM="${TERM#norc-}"
+       _home_short_dotbashrc=true
+fi
+
 if [ -z "$_home_short_dotbashrc" ];then
        _home_short_dotbashrc=true
+       # $TERM gets restored to its 'norc-' state after ~/.bashrc
+       # alias norc='TERM="norc-$TERM" ssh -t $USER@localhost "cd $PWD; TERM=$TERM;"'
+       function norc { TERM="norc-$TERM" ssh -t $USER@localhost "cd $PWD; TERM=$TERM;" "$@"; }; export -f norc
 
 if [ -f /etc/bashrc ];then source /etc/bashrc;fi
 
@@ -43,11 +55,14 @@ _bash_profile_addpath -f MANPATH         "/usr/X11R6/man"
 _bash_profile_addpath -f MANPATH         "/usr/share/man"
 _bash_profile_addpath -f MANPATH         "/usr/local/man"
 [ "`uname`" = "SunOS" ] && _bash_profile_addpath -f LD_LIBRARY_PATH "$HOME/Netscape/dist/lib"
-for arch in "" /`uname -p`;do
-       _bash_profile_addpath -f PATH            "$HOME$arch/bin"
-       [ $EUID -eq 0 ] && _bash_profile_addpath -f PATH "$HOME$arch/sbin"
-       _bash_profile_addpath -f LD_LIBRARY_PATH "$HOME$arch/lib"
-       _bash_profile_addpath -f MANPATH         "$HOME$arch/man"
+for family in "$HOME" "/net/jes-v65-0.czech.sun.com/export/jscqa-local";do
+       for arch in "$family" $family/`uname -p`;do
+               # Do not "-f": We use /net !
+               _bash_profile_addpath PATH            "$arch/bin"
+               [ $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
 _bash_profile_addpath    -s CVSROOT "$HOME/pserver/cvs"
@@ -111,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="${USER}[bash]@`uname -n`# "
+       export PS1='[bash]${USER}@${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