projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make sure we're explicitly capturing return codes in places where they are tested...
[monkeysphere.git]
/
src
/
share
/
m
/
subkey_to_ssh_agent
diff --git
a/src/share/m/subkey_to_ssh_agent
b/src/share/m/subkey_to_ssh_agent
index 818f4f70c3ae65a86ed58c169a02c31b89884d5e..a2cf9a0c5b42d9ad13a255e090ba8f2448a80cdc 100644
(file)
--- a/
src/share/m/subkey_to_ssh_agent
+++ b/
src/share/m/subkey_to_ssh_agent
@@
-14,11
+14,11
@@
# try to add all authentication subkeys to the agent
subkey_to_ssh_agent() {
# try to add all authentication subkeys to the agent
subkey_to_ssh_agent() {
- local sshaddresponse
+ local sshaddresponse
=0
local secretkeys
local authsubkeys
local workingdir
local secretkeys
local authsubkeys
local workingdir
- local keysuccess
+ local keysuccess
=0
local subkey
local publine
local kname
local subkey
local publine
local kname
@@
-38,8
+38,7
@@
For more details, see:
# and if it looks like it's running, but we can't actually talk to
# it, bail out:
# and if it looks like it's running, but we can't actually talk to
# it, bail out:
- ssh-add -l >/dev/null
- sshaddresponse="$?"
+ ssh-add -l >/dev/null || sshaddresponse="$?"
if [ "$sshaddresponse" = "2" ]; then
failure "Could not connect to ssh-agent"
fi
if [ "$sshaddresponse" = "2" ]; then
failure "Could not connect to ssh-agent"
fi
@@
-100,8
+99,7
@@
You might want to 'monkeysphere gen-subkey'"
passphrase_prompt "Enter passphrase for key $kname: " "$workingdir/passphrase"
wait %2
passphrase_prompt "Enter passphrase for key $kname: " "$workingdir/passphrase"
wait %2
- fi
- keysuccess="$?"
+ fi || keysuccess="$?"
rm -f "$workingdir/$kname"
done
rm -f "$workingdir/$kname"
done