Merge commit 'dkg/master'

Conflicts:

	src/seckey2sshagent

diff --cc src/seckey2sshagent
index 15e2706ff444aa04aa5c4cf6a68aa11f10d12ab4,4d08c66878d227332f03ceafd9fc93489616e3ed..aff323f4d7de90eefd733ca4f99e3621efadf409
--- 1/src/seckey2sshagent
--- 2/src/seckey2sshagent
+++ b/src/seckey2sshagent
@@@ -28,22 -33,10 +28,24 @@@ GPGID=$(echo "$1" | cut -c 25-
  
  FOO=$(mktemp -d)
  
 -gpg --export-secret-key --export-options export-reset-subkey-passwd $GPGID | GNUPGHOME=$FOO gpg --import
 +gpg --export-secret-key $GPGID | GNUPGHOME="$FOO" gpg --import
 +
 +# idea to script the password stuff.  not working.
 +# read -s -p "enter gpg password: " PASSWD; echo
 +# cmd=$(cat <<EOF
 +# passwd
 +# $PASSWD
 +# \n
 +# \n
 +# \n
 +# yes
 +# save
 +# EOF
 +# )
 +# echo -e "$cmd" | GNUPGHOME="$FOO" gpg --command-fd 0 --edit-key $GPGID
  
 -GNUPGHOME=$FOO gpg --edit-key $GPGID
 +GNUPGHOME="$FOO" gpg --edit-key $GPGID
  
 -ln -s /dev/stdin $FOO/monkeysphere-key
++ln -s /dev/stdin "$FOO"/monkeysphere-key
+ 
 -GNUPGHOME=$FOO gpg --export-secret-key $GPGID | openpgp2ssh $GPGID | (cd $FOO && ssh-add -c monkeysphere-key)
 +GNUPGHOME="$FOO" gpg --export-secret-key $GPGID | openpgp2ssh $GPGID | ssh-add -c /dev/stdin