Armored signature

[nncp.git] / makedist

diff --git a/makedist b/makedist
index 6adf2998e777251b6556ac5ed28f5c5d7f3543fb..f833a7f78e99e1e8ae0e47842028e581e8aa7f1a 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -122,9 +122,7 @@ cd ..
 tar cvf nncp-"$release".tar --uid=0 --gid=0 --numeric-owner nncp-"$release"
 xz -9v nncp-"$release".tar
 tarball=nncp-"$release".tar.xz
-gpg --detach-sign --sign --local-user releases@nncpgo.org "$tarball"
-gpg --enarmor < "$tarball".sig |
-    sed "/^Comment:/d ; s/ARMORED FILE/SIGNATURE/" > "$tarball".asc
+gpg --armor --detach-sign --sign --local-user releases@nncpgo.org "$tarball"
 meta4-create -fn "$tarball" -mtime "$tarball" -sig "$tarball".asc \
     http://www.nncpgo.org/download/"$tarball" \
     http://y.www.nncpgo.org/download/"$tarball" \
@@ -133,7 +131,7 @@ meta4-create -fn "$tarball" -mtime "$tarball" -sig "$tarball".asc \
 size=$(( $(stat -f %z $tarball) / 1024 ))
 release_date=$(date "+%Y-%m-%d")
 
-mv -v $tmp/"$tarball" $tmp/"$tarball".sig $tmp/"$tarball".meta4 $cur/doc/download
+mv -v $tmp/"$tarball" $tmp/"$tarball".asc $tmp/"$tarball".meta4 $cur/doc/download
 
 release_underscored=`echo $release | tr . _`
 cat <<EOF
@@ -141,7 +139,7 @@ An entry for documentation:
 @item @ref{Release $release_underscored, $release} @tab $release_date @tab $size KiB @tab
 @url{download/nncp-${release}.tar.xz.meta4, meta4}
 @url{download/nncp-${release}.tar.xz, tar}
-@url{download/nncp-${release}.tar.xz.sig, sig}
+@url{download/nncp-${release}.tar.xz.asc, sig}
 EOF
 
 cd $cur
@@ -180,7 +178,7 @@ NNCP's home page is: http://www.nncpgo.org/
 Source code and its signature for that version can be found here:
 
     http://www.nncpgo.org/download/nncp-${release}.tar.xz ($size KiB)
-    http://www.nncpgo.org/download/nncp-${release}.tar.xz.sig
+    http://www.nncpgo.org/download/nncp-${release}.tar.xz.asc
 
 GPG key ID: 0x2B25868E75A1A953 NNCP releases <releases@nncpgo.org>
 Fingerprint: 92C2 F0AE FE73 208E 46BF  F3DE 2B25 868E 75A1 A953
@@ -234,7 +232,7 @@ $(git cat-file -p v$release | sed -n '6,/^.*BEGIN/p' | sed '$d')
 Исходный код и его подпись для этой версии находятся здесь:
 
     http://www.nncpgo.org/download/nncp-${release}.tar.xz ($size KiB)
-    http://www.nncpgo.org/download/nncp-${release}.tar.xz.sig
+    http://www.nncpgo.org/download/nncp-${release}.tar.xz.asc
 
 Идентификатор GPG ключа: 0x2B25868E75A1A953 NNCP releases <releases@nncpgo.org>
 Отпечаток: 92C2 F0AE FE73 208E 46BF  F3DE 2B25 868E 75A1 A953