From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sat, 21 Jun 2008 21:08:34 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.2-1~12^2~1
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=6a202af09f5a1bc47069e5e36dbdfa3f6b392a5b;hp=-c;p=monkeysphere.git

Merge commit 'dkg/master'

Conflicts:

	src/seckey2sshagent
---

6a202af09f5a1bc47069e5e36dbdfa3f6b392a5b
diff --combined src/seckey2sshagent
index 15e2706,4d08c66..aff323f
--- a/src/seckey2sshagent
+++ b/src/seckey2sshagent
@@@ -23,27 -23,20 +23,29 @@@ cleanup() 
  
  trap cleanup EXIT
  
 -GPGID="$1"
 -
 -idchars=$(echo $GPGID | wc -m)
 -if [ "$idchars" -ne 17 ] ; then
 -    echo "GPGID is not 16 characters ($idchars)."
 -    exit 1
 -fi
 +#GPGID="$1"
 +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