diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-21 14:57:41 -0500 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-21 14:57:41 -0500 |
| commit | ff8383ce9092335de6c00447bb45a2a7fbbf8685 (patch) | |
| tree | 0bcf398381cb8b29743284450f728ecfd44609ee /src/share/m/subkey_to_ssh_agent | |
| parent | 64150bc621cda2167c81ce4283b934d17a4dbe56 (diff) | |
make sure we're explicitly capturing return codes in places where they are tested, in case things are being run set -e
Diffstat (limited to 'src/share/m/subkey_to_ssh_agent')
| -rw-r--r-- | src/share/m/subkey_to_ssh_agent | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/share/m/subkey_to_ssh_agent b/src/share/m/subkey_to_ssh_agent index 818f4f7..a2cf9a0 100644 --- 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() { - local sshaddresponse + local sshaddresponse=0 local secretkeys local authsubkeys local workingdir - local keysuccess + local keysuccess=0 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: - ssh-add -l >/dev/null - sshaddresponse="$?" + ssh-add -l >/dev/null || sshaddresponse="$?" 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 - fi - keysuccess="$?" + fi || keysuccess="$?" rm -f "$workingdir/$kname" done |