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

fix logic to remove tokens and keys

Browse source
This commit is contained in:
Jakobus Schürz 2020-09-22 21:03:25 +02:00
parent 599cc2ecf9
commit 0d17fdb87f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/ssh-agent-start-or-restart
View file

@ -206,7 +206,8 @@ agent-load-identity-keys () {
logtrace "${fingerprints[*]} and $fingerprint" logtrace "${fingerprints[*]} and $fingerprint"
if [[ ${fingerprints[*]} =~ "$fingerprint" ]]; then if [[ ${fingerprints[*]} =~ "$fingerprint" ]]; then
logdebug "$key is loaded" >&2 logdebug "$key is loaded" >&2
if [ $readd -o $remove ]; then logwarn "$readd $remove"
if $readd || $remove ; then
$readd && logwarn "readd key $key" >&2 $readd && logwarn "readd key $key" >&2
$remove && logwarn "remove key $key" >&2 $remove && logwarn "remove key $key" >&2
loginfo "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -d ${key} 2>&1)" loginfo "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -d ${key} 2>&1)"
@ -226,13 +227,12 @@ agent-load-identity-keys () {
logtrace "${fingerprints[*]} and $tokenfingerprint" logtrace "${fingerprints[*]} and $tokenfingerprint"
if [[ ${fingerprints[*]} =~ "$tokenfingerprint" ]]; then if [[ ${fingerprints[*]} =~ "$tokenfingerprint" ]]; then
logdebug "$token is loaded" >&2 logdebug "$token is loaded" >&2
if [ $readd -o $remove ]; then if $readd || $remove ; then
$readd && logwarn "readd token $token" >&2 $readd && logwarn "readd token $token" >&2
$remove && logwarn "remove token $token" >&2 $remove && logwarn "remove token $token" >&2
loginfo "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e ${token} 2>&1)" loginfo "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e ${token} 2>&1)"
$remove || loginfo "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -s ${token} 2>&1)" $remove || loginfo "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -s ${token} 2>&1)"
fi fi
$remove loginfo "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e ${token} 2>&1)"
else else
logwarn "$token is not loaded -> load it" >&2 logwarn "$token is not loaded -> load it" >&2
loginfo "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e ${token} 2>&1)" loginfo "$(ssh-runinagent $agentfile ssh-add ${SSH_ADD_OPTIONS} -e ${token} 2>&1)"