jakob/myshellconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

output without identity

Browse source
This commit is contained in:
Jakobus Schürz 2020-09-24 13:38:30 +02:00
parent ef27674c4e
commit d43f6e1700
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
bin/startagent
View file

@ -72,7 +72,8 @@ while :; do
exit 1 exit 1
;; ;;
*) *)
ssh_identity=${1-${SSH_DEFAULT_IDENTITY}} #ssh_identity=${1-${SSH_DEFAULT_IDENTITY}}
ssh_identity=${1}
break break
;; ;;
esac esac
@ -150,7 +151,8 @@ agent-start-or-restart () {
fi fi
logdebug "ssh-agent for identity »$ssh_identity«: $agentfile" logdebug "ssh-agent for identity »$ssh_identity«: $agentfile"
$createonly && logdebug "current loaded keys: $(ssh-runinagent $agentfile ssh-add -l)" $createonly && logdebug "current loaded keys after action:
$(ssh-runinagent $agentfile ssh-add -l)"
echo $agentfile echo $agentfile
ret=0 ret=0
else else
@ -165,6 +167,9 @@ agent-start-or-restart () {
agentfile="${SSH_AGENTS_DIR}/agent-gnome_session-$(hostname)" agentfile="${SSH_AGENTS_DIR}/agent-gnome_session-$(hostname)"
agentsocket="${SSH_AGENT_SOCKETS_DIR}/socket-gnome-session-$(hostname)" agentsocket="${SSH_AGENT_SOCKETS_DIR}/socket-gnome-session-$(hostname)"
gnome-keyring-daemon -s > $agentfile gnome-keyring-daemon -s > $agentfile
logdebug "ssh-agent for identity »$ssh_identity«: $agentfile"
logdebug "currently loaded keys after action:
$(ssh-runinagent $agentfile ssh-add -l)"
echo $agentfile echo $agentfile
ret=0 ret=0
else else
@ -204,14 +209,7 @@ agent-load-identity-keys () {
logtrace "identitydir: $identitydir" logtrace "identitydir: $identitydir"
fingerprints=( $(ssh-runinagent $agentfile "ssh-add -l|awk '{print \$2}'") ) fingerprints=( $(ssh-runinagent $agentfile "ssh-add -l|awk '{print \$2}'") )
# if $remove; then logdebug "fingerprints from loaded keys before action:"
# if [ ! $keyonly -a ! $tokenonly ] ; then
# loginfo "Remove all keys and token"
# /bin/sh -c "unset SSH_AUTH_SOCK SSH_AGENT_PID; . $agentfile >/dev/null 2>&1; ssh-add -D 2>&1"
# fi
# fi
#
logdebug "fingerprints from loaded keys:"
for f in ${fingerprints[*]};do for f in ${fingerprints[*]};do
logdebug "$f" logdebug "$f"
done done
@ -251,7 +249,7 @@ agent-load-identity-keys () {
fi fi
done done
fi fi
logdebug "currently loaded keys: logdebug "currently loaded keys after action:
$(ssh-runinagent $agentfile ssh-add -l)" $(ssh-runinagent $agentfile ssh-add -l)"
else else
logwarn "ssh-identity $ssh_identity is not configured. Please create $identitydir and add keys" logwarn "ssh-identity $ssh_identity is not configured. Please create $identitydir and add keys"