X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=.bashrc;h=c7125a5e552da943b92f035865683510ea2e1a25;hb=9dd74b7898cce5f91fb3821f6d301d5774bc24c8;hp=370bafe2601f812a8623a5e992d7e5d154a8e018;hpb=c9659eb8fd0c91275068667a66c03881156ff260;p=nethome.git diff --git a/.bashrc b/.bashrc index 370bafe..c7125a5 100644 --- a/.bashrc +++ b/.bashrc @@ -161,6 +161,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 @@ -236,6 +237,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 /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