Add trap to remove lockfiles on exit.

[monkeysphere.git] / src / seckey2sshagent

diff --git a/src/seckey2sshagent b/src/seckey2sshagent
index aff323f4d7de90eefd733ca4f99e3621efadf409..1266db5b329987af795f1b6ea286a33f27eb5691 100755 (executable)
--- a/src/seckey2sshagent
+++ b/src/seckey2sshagent
@@ -16,9 +16,9 @@
 
 
 cleanup() {
-    echo -n "removing temp gpg home... "
+    echo -n "removing temp gpg home... " 1>&2
     rm -rf $FOO
-    echo "done."
+    echo "done." 1>&2
 }
 
 trap cleanup EXIT
@@ -46,6 +46,7 @@ gpg --export-secret-key $GPGID | GNUPGHOME="$FOO" gpg --import
 
 GNUPGHOME="$FOO" gpg --edit-key $GPGID
 
-ln -s /dev/stdin "$FOO"/monkeysphere-key
+ln -s /dev/stdin "$FOO"/openpgp
 
-GNUPGHOME="$FOO" gpg --export-secret-key $GPGID | openpgp2ssh $GPGID | ssh-add -c /dev/stdin
+GNUPGHOME="$FOO" gpg --export-secret-key $GPGID | \
+    openpgp2ssh $GPGID | ssh-add -c "$FOO"/openpgp