Hashes are redundantly present in .meta4

diff --git a/doc/download.texi b/doc/download.texi
index 5c1c926b574389f4945de618f83c9240e5b177a4..94294fc7fe04a5a1819179adee9610cd79f651ae 100644 (file)
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -1,109 +1,79 @@
-@multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx}
-@headitem Version @tab Date @tab Size @tab Tarball @tab SHA256 checksum
-
-@item 3.7.1 @tab 2023-03-23 @tab 65 KiB
-@tab
-    @url{download/gocheese-3.7.1.tar.zst.meta4, meta4}
-    @url{download/gocheese-3.7.1.tar.zst, link}
-    @url{download/gocheese-3.7.1.tar.zst.sig, sig}
-@tab @code{25E763ED 5B31E387 7F3BB77F 1E796E9F CC21FD74 260948FC 27D92EDE 163D792B}
-
-@item 3.7.0 @tab 2022-11-28 @tab 68 KiB
-@tab
-    @url{download/gocheese-3.7.0.tar.zst.meta4, meta4}
-    @url{download/gocheese-3.7.0.tar.zst, link}
-    @url{download/gocheese-3.7.0.tar.zst.sig, sig}
-@tab @code{1D1F1808 7D5FB494 BDE0D39E CBBE32C2 FEE9BBF5 F765BFBC 58744F42 B26F3B93}
-
-@item 3.6.0 @tab 2022-11-03 @tab 68 KiB
-@tab
-    @url{download/gocheese-3.6.0.tar.zst.meta4, meta4}
-    @url{download/gocheese-3.6.0.tar.zst, link}
-    @url{download/gocheese-3.6.0.tar.zst.sig, sig}
-@tab @code{22A679BC A5594AA0 2511CFB2 301C5E6A BAE8D5A3 F6D3F979 843C3142 569DC59E}
-
-@item 3.5.0 @tab 2022-02-09 @tab 68 KiB
-@tab
-    @url{download/gocheese-3.5.0.tar.zst.meta4, meta4}
-    @url{download/gocheese-3.5.0.tar.zst, link}
-    @url{download/gocheese-3.5.0.tar.zst.sig, sig}
-@tab @code{2711CE96 7CB81C94 4B0629AB 146622E2 02CEF97B 83D9305C BDC99B9D 8BB26241}
-
-@item 3.4.0 @tab 2021-11-26 @tab 68 KiB
-@tab
-    @url{download/gocheese-3.4.0.tar.zst.meta4, meta4}
-    @url{download/gocheese-3.4.0.tar.zst, link}
-    @url{download/gocheese-3.4.0.tar.zst.sig, sig}
-@tab @code{DD3608C5 4DC8D251 776CCF40 67C3BD6F CCA35AA3 F805A0A4 E9164774 3E172DF9}
-
-@item 3.3.0 @tab 2021-09-28 @tab 68 KiB
-@tab
-    @url{download/gocheese-3.3.0.tar.zst.meta4, meta4}
-    @url{download/gocheese-3.3.0.tar.zst, link}
-    @url{download/gocheese-3.3.0.tar.zst.sig, sig}
-@tab @code{B71986D9 17618262 D1196B8C 7F976E19 4BE88452 1BB2813D 2D863400 D635A33D}
-
-@item 3.2.0 @tab 2021-09-27 @tab 68 KiB
-@tab
-    @url{download/gocheese-3.2.0.tar.zst.meta4, meta4}
-    @url{download/gocheese-3.2.0.tar.zst, link}
-    @url{download/gocheese-3.2.0.tar.zst.sig, sig}
-@tab @code{FA3F9352 A0632A54 014BD0F0 19CDC428 9C2BECEA B64B410C EA992A70 A706AF4F}
-
-@item 3.1.0 @tab 2021-09-27 @tab 68 KiB
-@tab
-    @url{download/gocheese-3.1.0.tar.zst.meta4, meta4}
-    @url{download/gocheese-3.1.0.tar.zst, link}
-    @url{download/gocheese-3.1.0.tar.zst.sig, sig}
-@tab @code{4416F90E 5A87F06E F2725FC3 4D3BD078 341DE4DB A883A91D 9F6E9CB0 30B12185}
-
-@item 3.0.0 @tab 2021-09-26 @tab 68 KiB
-@tab
-    @url{download/gocheese-3.0.0.tar.zst.meta4, meta4}
-    @url{download/gocheese-3.0.0.tar.zst, link}
-    @url{download/gocheese-3.0.0.tar.zst.sig, sig}
-@tab @code{7403FFB5 8D39C631 64C9D2C4 0507F603 FF92ACB2 3FA21DD5 C545D5EB 251CAE18}
-
-@item 2.6.0 @tab 2021-01-22 @tab 58 KiB
-@tab
-    @url{download/gocheese-2.6.0.tar.zst.meta4, meta4}
-    @url{download/gocheese-2.6.0.tar.zst, link}
-    @url{download/gocheese-2.6.0.tar.zst.sig, sig}
-@tab @code{20DE75D6 903EAE4B FF1B83A2 3E91AC50 F1FA3D37 8D14829C BB130B50 020020B4}
-
-@item 2.5.0 @tab 2020-11-07 @tab 110 KiB
-@tab
-    @url{download/gocheese-2.5.0.tar.xz.meta4, meta4}
-    @url{download/gocheese-2.5.0.tar.xz, link}
-    @url{download/gocheese-2.5.0.tar.xz.sig, sig}
-@tab @code{C437AD4D 33E899F6 9DE7FC28 92F5C49C 8409913E EA26BA95 18144870 D74107B4}
-
-@item 2.4.1 @tab 2020-09-05 @tab 105 KiB
-@tab
-    @url{download/gocheese-2.4.1.tar.xz.meta4, meta4}
-    @url{download/gocheese-2.4.1.tar.xz, link}
-    @url{download/gocheese-2.4.1.tar.xz.sig, sig}
-@tab @code{8B8C5A8D 748FDB3D 875EC9DA 83744FFF 314FDDE9 22561BDE 7BBD290F 86642C0F}
-
-@item 2.4.0 @tab 2020-07-24 @tab 101 KiB
-@tab
-    @url{download/gocheese-2.4.0.tar.xz.meta4, meta4}
-    @url{download/gocheese-2.4.0.tar.xz, link}
-    @url{download/gocheese-2.4.0.tar.xz.sig, sig}
-@tab @code{6EE9A436 F415AB09 6D75FA5A D9BFBD6A 9BF9ACE2 52514802 CBFDF576 C057B2AC}
-
-@item 2.3.0 @tab 2019-12-17 @tab 101 KiB
-@tab
-    @url{download/gocheese-2.3.0.tar.xz.meta4, meta4}
-    @url{download/gocheese-2.3.0.tar.xz, link}
-    @url{download/gocheese-2.3.0.tar.xz.sig, sig}
-@tab @code{574C3641 BBDA2957 2FE57F03 98606403 4D7B2C58 44B2CFA4 0EBF9F75 E0186989}
-
-@item 2.2.0 @tab 2019-12-09 @tab 100 KiB
-@tab
-    @url{download/gocheese-2.2.0.tar.xz.meta4, meta4}
-    @url{download/gocheese-2.2.0.tar.xz, link}
-    @url{download/gocheese-2.2.0.tar.xz.sig, sig}
-@tab @code{5AA24DA6 C03C51BD 5C45CD50 AA1F19B5 6360C892 3ED86F06 D0F2B8FA 4C8CCB5B}
+@multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {meta4 tar sign}
+@headitem Version @tab Date @tab Size @tab Tarball
+
+@item 3.7.1 @tab 2023-03-23 @tab 65 KiB @tab
+@url{download/gocheese-3.7.1.tar.zst.meta4, meta4}
+@url{download/gocheese-3.7.1.tar.zst, tar}
+@url{download/gocheese-3.7.1.tar.zst.sig, sig}
+
+@item 3.7.0 @tab 2022-11-28 @tab 68 KiB @tab
+@url{download/gocheese-3.7.0.tar.zst.meta4, meta4}
+@url{download/gocheese-3.7.0.tar.zst, tar}
+@url{download/gocheese-3.7.0.tar.zst.sig, sig}
+
+@item 3.6.0 @tab 2022-11-03 @tab 68 KiB @tab
+@url{download/gocheese-3.6.0.tar.zst.meta4, meta4}
+@url{download/gocheese-3.6.0.tar.zst, tar}
+@url{download/gocheese-3.6.0.tar.zst.sig, sig}
+
+@item 3.5.0 @tab 2022-02-09 @tab 68 KiB @tab
+@url{download/gocheese-3.5.0.tar.zst.meta4, meta4}
+@url{download/gocheese-3.5.0.tar.zst, tar}
+@url{download/gocheese-3.5.0.tar.zst.sig, sig}
+
+@item 3.4.0 @tab 2021-11-26 @tab 68 KiB @tab
+@url{download/gocheese-3.4.0.tar.zst.meta4, meta4}
+@url{download/gocheese-3.4.0.tar.zst, tar}
+@url{download/gocheese-3.4.0.tar.zst.sig, sig}
+
+@item 3.3.0 @tab 2021-09-28 @tab 68 KiB @tab
+@url{download/gocheese-3.3.0.tar.zst.meta4, meta4}
+@url{download/gocheese-3.3.0.tar.zst, tar}
+@url{download/gocheese-3.3.0.tar.zst.sig, sig}
+
+@item 3.2.0 @tab 2021-09-27 @tab 68 KiB @tab
+@url{download/gocheese-3.2.0.tar.zst.meta4, meta4}
+@url{download/gocheese-3.2.0.tar.zst, tar}
+@url{download/gocheese-3.2.0.tar.zst.sig, sig}
+
+@item 3.1.0 @tab 2021-09-27 @tab 68 KiB @tab
+@url{download/gocheese-3.1.0.tar.zst.meta4, meta4}
+@url{download/gocheese-3.1.0.tar.zst, tar}
+@url{download/gocheese-3.1.0.tar.zst.sig, sig}
+
+@item 3.0.0 @tab 2021-09-26 @tab 68 KiB @tab
+@url{download/gocheese-3.0.0.tar.zst.meta4, meta4}
+@url{download/gocheese-3.0.0.tar.zst, tar}
+@url{download/gocheese-3.0.0.tar.zst.sig, sig}
+
+@item 2.6.0 @tab 2021-01-22 @tab 58 KiB @tab
+@url{download/gocheese-2.6.0.tar.zst.meta4, meta4}
+@url{download/gocheese-2.6.0.tar.zst, tar}
+@url{download/gocheese-2.6.0.tar.zst.sig, sig}
+
+@item 2.5.0 @tab 2020-11-07 @tab 110 KiB @tab
+@url{download/gocheese-2.5.0.tar.xz.meta4, meta4}
+@url{download/gocheese-2.5.0.tar.xz, tar}
+@url{download/gocheese-2.5.0.tar.xz.sig, sig}
+
+@item 2.4.1 @tab 2020-09-05 @tab 105 KiB @tab
+@url{download/gocheese-2.4.1.tar.xz.meta4, meta4}
+@url{download/gocheese-2.4.1.tar.xz, tar}
+@url{download/gocheese-2.4.1.tar.xz.sig, sig}
+
+@item 2.4.0 @tab 2020-07-24 @tab 101 KiB @tab
+@url{download/gocheese-2.4.0.tar.xz.meta4, meta4}
+@url{download/gocheese-2.4.0.tar.xz, tar}
+@url{download/gocheese-2.4.0.tar.xz.sig, sig}
+
+@item 2.3.0 @tab 2019-12-17 @tab 101 KiB @tab
+@url{download/gocheese-2.3.0.tar.xz.meta4, meta4}
+@url{download/gocheese-2.3.0.tar.xz, tar}
+@url{download/gocheese-2.3.0.tar.xz.sig, sig}
+
+@item 2.2.0 @tab 2019-12-09 @tab 100 KiB @tab
+@url{download/gocheese-2.2.0.tar.xz.meta4, meta4}
+@url{download/gocheese-2.2.0.tar.xz, tar}
+@url{download/gocheese-2.2.0.tar.xz.sig, sig}
 
 @end multitable

diff --git a/makedist b/makedist
index e5af33946a5249687b67e92259a66ec7028bb550..81a4854052d222b58955cf52a6f1d6305fe0bd70 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -55,9 +55,9 @@ tarball=gocheese-"$release".tar.zst
 gpg --detach-sign --sign --local-user CD5CD01F55343D88 $tarball
 gpg --enarmor < "$tarball".sig |
     sed "/^Comment:/d ; s/ARMORED FILE/SIGNATURE/" > "$tarball".asc
-meta4-create -file "$tarball" -mtime "$tarball" -sig "$tarball".asc \
+meta4-create -fn "$tarball" -mtime "$tarball" -sig "$tarball".asc \
     http://www.gocheese.cypherpunks.ru/download/"$tarball" \
-    http://y.www.gocheese.cypherpunks.ru/download/"$tarball" > "$tarball".meta4
+    http://y.www.gocheese.cypherpunks.ru/download/"$tarball" < "$tarball" > "$tarball".meta4
 
 size=$(( $(stat -f %z $tarball) / 1024 ))
 hash=$(gpg --print-md SHA256 < $tarball)
@@ -65,12 +65,10 @@ release_date=$(date "+%Y-%m-%d")
 
 cat <<EOF
 An entry for documentation:
-@item $release @tab $release_date @tab $size KiB
-@tab
-    @url{download/gocheese-${release}.tar.zst.meta4, meta4}
-    @url{download/gocheese-${release}.tar.zst, link}
-    @url{download/gocheese-${release}.tar.zst.sig, sig}
-@tab @code{$hash}
+@item $release @tab $release_date @tab $size KiB @tab
+@url{download/gocheese-${release}.tar.zst.meta4, meta4}
+@url{download/gocheese-${release}.tar.zst, link}
+@url{download/gocheese-${release}.tar.zst.sig, sig}
 EOF
 
 mv $tmp/$tarball $tmp/"$tarball".sig $tmp/"$tarball".meta4 $cur/doc/gocheese.html/download