makedist | 8 +++++--- diff --git a/makedist b/makedist index 570682ca88cc7842bdd90d3046d292d13125b203c989182f9d37a4dbe2af9402..7eed82ed645b061de8f86b7653beba79e03d606f557226dbcdaffdf45cfc1336 100755 --- a/makedist +++ b/makedist @@ -20,8 +20,9 @@ detpax pygost-$release >pygost-$release.tar zstd -22 --ultra -v pygost-$release.tar tarball=pygost-$release.tar.zst ssh-keygen -Y sign -f ~/.ssh/sign/pygost@stargrave.org -n file $tarball +cmsigtool -d ~/.cm/sign/pygost@stargrave.org.pub <$tarball >$tarball.cm meta4ra-create -fn $tarball -mtime $tarball \ - -sig-pgp $tarball.asc -sig-ssh $tarball.sig \ + -sig-ssh $tarball.sig \ "1|ru|http://www.pygost.stargrave.org/$tarball" \ "2|ru|http://msk.www.pygost.stargrave.org/$tarball" \ "2|ru|http://spb.www.pygost.stargrave.org/$tarball" \ @@ -33,7 +34,6 @@ "5|ru|http://[322:3bd:cc26:9545:b00b:56a5:870a:16a4]/$tarball" \ "6|ru|sftp://anonwww@msk.www.stargrave.org/pygost.stargrave.org/$tarball" \ "6|ru|sftp://anonwww@spb.www.stargrave.org/pygost.stargrave.org/$tarball" \ <$tarball >$tarball.meta4 -mv $tarball.meta4_ $tarball.meta4 meta4ra-create -add $tarball.meta4 -fn $tarball.cm -hashers "" \ -id "KEKS/CM detached signature" \ "1|ru|http://www.pygost.stargrave.org/$tarball.cm" \ @@ -74,7 +74,7 @@ => pygost-$release.tar.zst tar => pygost-$release.tar.zst.meta4 meta4 EOF -mv $tmp/$tarball $tmp/$tarball.asc $tmp/$tarball.sig $tmp/$tarball.meta4 \ +mv $tmp/$tarball $tmp/$tarball.sig $tmp/$tarball.cm $tmp/$tarball.meta4 \ $cur/doc/pygost.html/ cat <