Hashes are redundantly present in .meta4

[gogost.git] / makedist

diff --git a/makedist b/makedist
index dbe1f9d11827e4af63ab353ff90044b2098ea907..18860551a6ff74a0b9a8a985e04a1552d60bf343 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -80,24 +80,19 @@ tarball=gogost-"$release".tar.zst
 gpg --detach-sign --sign --local-user 82343436696FC85A $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.gogost.cypherpunks.ru/"$tarball" \
-    http://y.www.gogost.cypherpunks.ru/"$tarball" > "$tarball".meta4
+    http://y.www.gogost.cypherpunks.ru/"$tarball" < "$tarball" > "$tarball".meta4
 
 size=$(( $(stat -f %z $tarball) / 1024 ))
-hash=$(gpg --print-md SHA256 < $tarball)
-hashsb=$($HOME/work/gogost/streebog256 < $tarball)
 release_date=$(date "+%Y-%m-%d")
 
 cat <<EOF
 An entry for documentation:
-@item @ref{Release $release, $release} @tab $release_date @tab $size KiB
-@tab
-    @url{$tarball.meta4, meta4}
-    @url{$tarball, link}
-    @url{$tarball.sig, sig}
-@tab @code{$hash}
-@tab @code{$hashsb}
+@item @ref{Release $release, $release} @tab $release_date @tab $size KiB @tab
+@url{$tarball.meta4, meta4}
+@url{$tarball, tar}
+@url{$tarball.sig, sig}
 EOF
 
 cat <<EOF
@@ -122,8 +117,6 @@ Source code and its signature for that version can be found here:
     http://www.gogost.cypherpunks.ru/gogost-${release}.tar.zst ($size KiB)
     http://www.gogost.cypherpunks.ru/gogost-${release}.tar.zst.sig
 
-Streebog-256 hash: $hashsb
-SHA256 hash: $hash
 GPG key: CEBD 1282 2C46 9C02 A81A  0467 8234 3436 696F C85A
          GoGOST releases <gogost at cypherpunks dot ru>
 
@@ -154,8 +147,6 @@ GoGOST это свободное программное обеспечение 
     http://www.gogost.cypherpunks.ru/gogost-${release}.tar.zst ($size KiB)
     http://www.gogost.cypherpunks.ru/gogost-${release}.tar.zst.sig
 
-Streebog-256 хэш: $hashsb
-SHA256 хэш: $hash
 GPG ключ: CEBD 1282 2C46 9C02 A81A  0467 8234 3436 696F C85A
           GoGOST releases <gogost at cypherpunks dot ru>