X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=makedist;h=f833a7f78e99e1e8ae0e47842028e581e8aa7f1a;hb=7058f97373b95cb0e19b48a424d95fc850614da8;hp=997ce75b4e9a51645bd2d4586b043fea6555ec9a;hpb=ed8296d7858a565ea496340d42e75ce358ea44b5;p=nncp.git

diff --git a/makedist b/makedist
index 997ce75..f833a7f 100755
--- a/makedist
+++ b/makedist
@@ -110,7 +110,7 @@ rm -r doc/.well-known
 perl -i -npe "s/GO build/GO build -mod=vendor/" bin/default.do bin/hjson-cli.do
 perl -i -npe "s/GO list/GO list -mod=vendor/" bin/default.do
 perl -i -npe "s/GO test/GO test -mod=vendor/" test.do
-rm makedist.sh VERSION.do
+rm makedist VERSION.do
 rm -r .git
 redo-cleanup full
 find . -type d -exec chmod 755 {} +
@@ -122,29 +122,24 @@ 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
-meta4-create -file "$tarball" -mtime "$tarball" -sig "$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" \
-    https://nncp.mirrors.quux.org/download/"$tarball" > "$tarball".meta4
+    https://nncp.mirrors.quux.org/download/"$tarball" < "$tarball" > "$tarball".meta4
 
 size=$(( $(stat -f %z $tarball) / 1024 ))
-hash=$(gpg --print-md SHA256 < $tarball)
 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
 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, link}
-    @url{download/nncp-${release}.tar.xz.sig, sig}
-@tab @code{$hash}
+@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.asc, sig}
 EOF
 
 cd $cur
@@ -183,9 +178,8 @@ 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
 
-SHA256 hash: $hash
 GPG key ID: 0x2B25868E75A1A953 NNCP releases <releases@nncpgo.org>
 Fingerprint: 92C2 F0AE FE73 208E 46BF  F3DE 2B25 868E 75A1 A953
 
@@ -238,9 +232,8 @@ $(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
 
-SHA256 хэш: $hash
 Идентификатор GPG ключа: 0x2B25868E75A1A953 NNCP releases <releases@nncpgo.org>
 Отпечаток: 92C2 F0AE FE73 208E 46BF  F3DE 2B25 868E 75A1 A953