diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-19 15:31:17 -0500 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-19 15:31:17 -0500 |
| commit | 0d07156e8db60611c28e5f440ff5f6a39d655ff6 (patch) | |
| tree | 8d49612143222d018a074bdb3371a0f62bf5af8b /src/share/m/import_subkey | |
| parent | bd64869a3b68ff8a020c381371a8ab1e24a5a0e4 (diff) | |
add a gpg_user function in monkeysphere to add some gpg quieting
option, and use it in all gpg invocations.
add a trap to subkey_to_ssh_agent.
Diffstat (limited to 'src/share/m/import_subkey')
| -rw-r--r-- | src/share/m/import_subkey | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/share/m/import_subkey b/src/share/m/import_subkey index d71c258..f3ca957 100644 --- a/src/share/m/import_subkey +++ b/src/share/m/import_subkey @@ -43,11 +43,11 @@ import_subkey() { if [ "$sshKeyFile" = '-' ] ; then log verbose "importing ssh key from stdin..." ssh2openpgp \ - | gpg --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import & + | gpg_user --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import & else log verbose "importing ssh key from file '$sshKeyFile'..." ssh2openpgp <"$sshKeyFile" \ - | gpg --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import & + | gpg_user --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import & fi # get the password if needed |