More convenient trusted-host

[gocheese.git] / makedist

diff --git a/makedist b/makedist
index e5af33946a5249687b67e92259a66ec7028bb550..834bcf0df043a57b0c8f46d7f74cbc2fcffb066b 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -36,7 +36,6 @@ cat > $texi <<EOF
 @include install.texi
 @bye
 EOF
-perl -i -p -e "s/.verbatiminclude ...PUBKEY.asc/Look in PUBKEY.asc file./" install.texi
 mkinfo --output ../INSTALL $texi
 rm $texi
 cd ..
@@ -52,25 +51,23 @@ cd ..
 tar cvf gocheese-"$release".tar --uid=0 --gid=0 --numeric-owner gocheese-"$release"
 zstd -19 -v gocheese-"$release".tar
 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 \
+ssh-keygen -Y sign -f ~/.ssh/sign/gocheese@cypherpunks.ru -n file $tarball
+gpg --armor --detach-sign --sign --local-user CD5CD01F55343D88 $tarball
+meta4-create -fn "$tarball" -mtime "$tarball" \
+    -sig-pgp "$tarball".asc -sig-ssh "$tarball".sig \
     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)
 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, tar}
+@url{download/gocheese-${release}.tar.zst.asc, pgp}
+@url{download/gocheese-${release}.tar.zst.sig, ssh}
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".sig $tmp/"$tarball".meta4 $cur/doc/gocheese.html/download
+mv $tmp/$tarball $tmp/"$tarball".asc $tmp/"$tarball".sig $tmp/"$tarball".meta4 $cur/doc/gocheese.html/download