X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fseckey2sshagent;h=15e2706ff444aa04aa5c4cf6a68aa11f10d12ab4;hb=bee2295c0e205787584788d1e611e92ec6b0fe96;hp=d8e9b79ac2e86da91cf156de986a8434135e7b37;hpb=820b8e93b72b33eba262643b9d9095c351e4ffb9;p=monkeysphere.git

diff --git a/src/seckey2sshagent b/src/seckey2sshagent
index d8e9b79..15e2706 100755
--- a/src/seckey2sshagent
+++ b/src/seckey2sshagent
@@ -23,18 +23,27 @@ 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
-
-GNUPGHOME=$FOO gpg --edit-key $GPGID
-
-GNUPGHOME=$FOO gpg --export-secret-key $GPGID | openpgp2ssh $GPGID | ssh-add -c /dev/stdin
+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 --export-secret-key $GPGID | openpgp2ssh $GPGID | ssh-add -c /dev/stdin