Another spy

[tofuproxy.git] / makedist

diff --git a/makedist b/makedist
index b44a5250043c5fdddfd3964bf269509f434e74f1..23c5851dad3b687e5e34d391a6eb5616de458ecf 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -57,26 +57,24 @@ cd ..
 tar cvf tofuproxy-"$release".tar --uid=0 --gid=0 --numeric-owner tofuproxy-"$release"
 zstd -19 -v tofuproxy-"$release".tar
 tarball=tofuproxy-"$release".tar.zst
-gpg --detach-sign --sign --local-user 12AD32689C660D426967FD75CB8205632107AD8A "$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/tofuproxy@stargrave.org -n file $tarball
+gpg --armor --detach-sign --sign --local-user 3477D3292C775BF39DAA0E075921D596A332F844 "$tarball"
+meta4-create -fn "$tarball" -mtime "$tarball" \
+    -sig-pgp "$tarball".asc -sig-ssh "$tarball".sig \
     http://www.tofuproxy.stargrave.org/download/"$tarball" \
-    http://y.www.tofuproxy.stargrave.org/download/"$tarball" > "$tarball".meta4
+    http://y.www.tofuproxy.stargrave.org/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 $release @tab $release_date @tab $size KiB
-@tab
+@item $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}
+    @url{download/$tarball, tar}
+    @url{download/$tarball.asc, pgp}
+    @url{download/$tarball.asc, ssh}
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".sig $tarball.meta4 $cur/doc/tofuproxy.html/download
+mv $tmp/$tarball $tmp/"$tarball".asc $tmp/"$tarball".sig $tarball.meta4 $cur/doc/tofuproxy.html/download