Update dependencies

[goredo.git] / makedist

diff --git a/makedist b/makedist
index 7bc8311a5b1443f7f3086236bd234403eec97601..337c8f13f216232f2a4016902df8d82672a95c9a 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -86,29 +86,24 @@ cd ..
 tar cvf goredo-"$release".tar --uid=0 --gid=0 --numeric-owner goredo-"$release"
 zstd -19 -v goredo-"$release".tar
 tarball=goredo-"$release".tar.zst
-gpg --detach-sign --sign --local-user 3A528DDE952C7E93 "$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 3A528DDE952C7E93 "$tarball"
+meta4-create -fn "$tarball" -mtime "$tarball" -sig "$tarball".asc \
     http://www.goredo.cypherpunks.ru/download/"$tarball" \
-    http://y.www.goredo.cypherpunks.ru/download/"$tarball" > "$tarball".meta4
+    http://y.www.goredo.cypherpunks.ru/download/"$tarball" < "$tarball" > "$tarball".meta4
 
 size=$(( $(stat -f %z $tarball) / 1024 ))
-hash=$(gpg --print-md SHA256 < $tarball)
 release_date=$(date "+%Y-%m-%d")
 
 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/$tarball.meta4, meta4}
-    @url{download/$tarball, link}
-    @url{download/$tarball.sig, sig}
-@tab @code{$hash}
+@item @ref{Release $release_underscored, $release} @tab $release_date @tab $size KiB @tab
+@url{download/$tarball.meta4, meta4}
+@url{download/$tarball, tar}
+@url{download/$tarball.sig, sig}
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".sig $tarball.meta4 $cur/doc/goredo.html/download
+mv $tmp/$tarball $tmp/"$tarball".asc $tarball.meta4 $cur/doc/goredo.html/download
 
 cat <<EOF
 Subject: goredo $release release announcement
@@ -130,9 +125,8 @@ goredo's home page is: http://www.goredo.cypherpunks.ru/
 Source code and its signature for that version can be found here:
 
     http://www.goredo.cypherpunks.ru/download/goredo-${release}.tar.zst ($size KiB)
-    http://www.goredo.cypherpunks.ru/download/goredo-${release}.tar.zst.sig
+    http://www.goredo.cypherpunks.ru/download/goredo-${release}.tar.zst.asc
 
-SHA256 hash: $hash
 GPG key ID: 0x3A528DDE952C7E93 goredo releases <goredo@cypherpunks.ru>
 Fingerprint: 7531 BB84 FAF0 BF35 960C  63B9 3A52 8DDE 952C 7E93