Set $TMOUT only for SSH remote connections.

[nethome.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index df1e3b1..370bafe 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -11,11 +11,23 @@ if [ -n "$_home_short_dotbashrc_norc" -o "${TERM#norc-}" != "$TERM" ];then
 fi
 
 if [ -z "$_home_short_dotbashrc" ];then
-       _home_short_dotbashrc=true
+       # We permit later reinitialization by unsetting it.
+       # During our execution we forbid spawning to prevent deadlock by:
+       #       source /etc/bashrc
+       #       . /etc/profile.d/lang.sh
+       #       unicode_start iso02.08
+       export _home_short_dotbashrc=true
        # $TERM gets restored to its 'norc-' state after ~/.bashrc
        # alias norc='TERM="norc-$TERM" ssh -t -o 'NoHostAuthenticationForLocalhost yes' $USER@localhost "cd $PWD; TERM=$TERM;"'
        function norc { TERM="norc-$TERM" ssh -t -o 'NoHostAuthenticationForLocalhost yes' $USER@localhost "cd $PWD; TERM=$TERM;" "$@"; }; export -f norc
 
+# Fix $USER and $LOGNAME (not $MAIL) for /etc/passwd line:
+# root-lace:x:0:0:root for Jan Kratochvil:/home/root-lace:/bin/bash
+if [ "$UID" -eq 0 -a "$USER" = "root" -a "$HOME" != "${HOME#*/root-}" ];then
+       USER="${HOME##*/}"
+       LOGNAME="$USER"
+fi
+
 if [ -f /etc/bashrc ];then source /etc/bashrc;fi
 
 function _bash_profile_addpath # <variablename>,<dirpathname>
@@ -129,7 +141,7 @@ unalias 2>/dev/null du      # -h
 
 export IGNOREEOF=10
 # '2>/dev/null' to prevent: TMOUT: readonly variable
-export TMOUT=900 2>/dev/null
+[ -n "$SSH_TTY" ] && export TMOUT=900 2>/dev/null
 export EDITOR='vim'
 [ -x /bin/less ] && export PAGER='/bin/less -MMh5cis'
 export PERL_MM_OPT="PERL=$HOME/bin/perlilib"
@@ -154,6 +166,11 @@ export CVS_RSH="ssh"
 # as Sun workaround as Debian misses: /etc/termcap
 # expects: $uname_p
 [ "$TERM" = vt220 -a "${uname_p%86}" != "$uname_p" ] && export TERM=linux
+if grep 2>/dev/null -q '^..............:0C38 00000000:0000 0A ' /proc/net/tcp;then
+       export  http_proxy=http://127.0.0.1:3128/
+       export https_proxy=http://127.0.0.1:3128/
+       export   ftp_proxy=http://127.0.0.1:3128/
+fi
 
 export SOCKS5_SERVER=icsocks.holland.sun.com