Cosmetic: Fixed help text typo.

[nethome.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 370bafe..0f7d21d 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -122,6 +122,7 @@ alias maple="ssh -t vega.fjfi.cvut.cz maple"
 alias vi='vim'
 alias grepb='grep --binary-files=binary'
 alias L='lynx'
+alias chown='chown --no-dereference'
 alias cvs2cl='cvs2cl --window 3600 --separate-header --no-wrap'
 alias cvsfiles='cvsutil --files --print'
 alias cvsignores='cvsutil --ignores --print'
@@ -161,6 +162,7 @@ if [ -n "$PS1" ];then       # set only in interactive sessions
 export MINICOM="-m -c on"      # metakeys+color
 export HISTSIZE=100000
 export HISTFILESIZE="$HISTSIZE"
+export GDBHISTFILE="$HOME/.gdb_history"
 export CVS_RSH="ssh"
 # Do not: grep -w "$TERM" /etc/termcap >/dev/null || export TERM=vt220
 # as Sun workaround as Debian misses: /etc/termcap
@@ -184,11 +186,6 @@ export LC_COLLATE=C
 #         export LC_ALL=C
 # as it breaks Mutt "utf-8" and somehow it is no longer needed.
 
-function cvsdiff    { cvs diff   "$@" 2>&1|pipebuf -q|             less; }; export -f cvsdiff
-function cvsdiffi   { cvs diff   "$@" 2>&1|pipebuf -q|grep -v '^?'|less; }; export -f cvsdiffi
-function cvsupdate  { cvs update "$@" 2>&1|pipebuf -q|             less; }; export -f cvsupdate
-function cvsupdatei { cvs update "$@" 2>&1|pipebuf -q|grep -v '^?'|less; }; export -f cvsupdatei
-
 function wclines { awk '{x[$0]++}END{for (i in x) print x[i]"\t"i}'; }; export -f wclines
 # SunOS does not support "-m"
 export ULIMITME_OPTS=""
@@ -227,7 +224,7 @@ function ctags {(unset ctags;
 function ctagsh { ctags "--c-types=+px"; }; export -f ctagsh
 function cpan {(unset cpan; if [ $# = 0 ];then cpan;else perl -MCPAN -e "install qw($*);";fi; );}; export -f cpan
 function exx { cd "`unset exx;exx "$@"|tee /proc/self/fd/2|tail -n1|sed -n 's/^extdir=//p'`"; };export -f exx
-function revlines { perl -e 'my @r=();push @r,$_ while (<>);print pop @r while @r;'; }; export -f revlines
+function revlines { perl -e 'print reverse <>;'; }; export -f revlines
 
 ulimit -S -c 0
 set +H
@@ -236,6 +233,45 @@ unset OPTIND
 
 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
+
+       agenteval=/tmp/.$USER.ssh-agent.eval
+       if lockfile -1 -r 3 -l 10 -s 1 $agenteval.lock;then
+               test -f $agenteval -a -O $agenteval -a -G $agenteval &&
+                               # ">/dev/null" to prevent: echo Agent pid 31074;
+                               source $agenteval >/dev/null
+               if [ "ssh-agent" != "`(xargs -0 </proc/"$SSH_AGENT_PID"/cmdline sh -c 'echo "$0"') 2>/dev/null `" ];then
+                       rm -f $agenteval
+                       (test ! -e $agenteval && ssh-agent -s >$agenteval) || echo >&2 'Failing ssh-agent!'
+                       # ">/dev/null" to prevent: echo Agent pid 31074;
+                       source $agenteval >/dev/null
+               fi
+               rm -f $agenteval.lock
+       fi
+
+       # Prevent gdm(8) lockups on non-interactive consoles.
+       tty -s || continue
+       (ssh-add -l|grep -qw "$key") && continue
+       if lockfile -! -1 -r 0 $agenteval.input.lock 2>/dev/null;then
+               echo >&2 -n "Locking: $agenteval.input.lock ... "
+               lockfile -1 -r -1 $agenteval.input.lock
+               echo >&2 "locked"
+       fi
+       # Recheck identity existence after the lock acquire
+       if ssh-add -l|grep -qw "$key";then
+               echo >&2 "Identity $key already appended in the meantime."
+       else
+               # "2>/dev/null" to prevent: Identity added: .ssh/id_dsa (.ssh/id_dsa)
+               ssh-add "$key" 2>/dev/null
+       fi
+       rm -f $agenteval.input.lock
+       echo >&2 "$agenteval.input.lock unlocked."
+done
+unset agenteval
+
        unset _home_short_dotbashrc     # permit later reinitializations
 fi     # _home_short_dotbashrc