* caff: when set, use $ENV{'GNUPGHOME'} to find secring.gpg. Suggested by

[pgp-tools.git] / gpg-mailkeys / gpg-mailkeys

diff --git a/gpg-mailkeys/gpg-mailkeys b/gpg-mailkeys/gpg-mailkeys
index 534eb7efe3a4b014f6b6cc5fc444ced845689e6b..d9ca25968dff3d540d237b40f0d23704ce1ddec2 100755 (executable)
--- a/gpg-mailkeys/gpg-mailkeys
+++ b/gpg-mailkeys/gpg-mailkeys
@@ -6,7 +6,7 @@
 
 set -e
 
-VERSION="0.4.0"
+VERSION='$Rev$'
 
 if [ -z "$*" ]; then
        echo "Send people their newly signed GPG key by mail."
@@ -59,7 +59,7 @@ Subject: $SUBJECT
 User-Agent: gpg-mailkeys/$VERSION
 MIME-Version: 1.0
 Content-Type: multipart/mixed; micalg=pgp-sha1;
-    protocol="application/pgp-signature"; boundary="$BOUNDARY"
+    boundary="$BOUNDARY"
 Content-Disposition: inline
 
 
@@ -82,15 +82,15 @@ fi
 cat << EOM >> $TEMPFILE
 
 --$BOUNDARY
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: attachment; filename="$1.sig"
+Content-Type: application/pgp-keys
+Content-Disposition: attachment; filename="$1.asc"
 
 `gpg --armor --export $1`
 
 --$BOUNDARY--
 EOM
        echo -n " sending"
-       /usr/sbin/sendmail -t <$TEMPFILE
+       /usr/sbin/sendmail -ti <$TEMPFILE
        rm $TEMPFILE
        echo " done."
        shift 1