doc/mk-html | 4 ++-- makedist | 70 +++++++++++++++++++++++++++++++++++++---------------- diff --git a/doc/mk-html b/doc/mk-html index 710049bfd7a77d09f0b82e62718b20ce462baaae03707a7a44cee038c401279c..78fa1c835eae3672baee2464f40454fc90740af79a0a32325ab0070ceb56c3a6 100755 --- a/doc/mk-html +++ b/doc/mk-html @@ -2,9 +2,9 @@ #!/bin/sh html=goredo.html rm -f $html/*.html -SWG_DO_SRC=0 SWG_DO_BACKS=0 swg htmls goredo.html +SWG_DO_SRC=0 SWG_DO_BACKS=0 swg htmls $html perl -i -npe 's#^.*$#<title>goredo#' $html/index.html -cp ../PUBKEY-* $html/ +ln -f ../PUBKEY-* $html/ ( cd $html/download export ATOM_ID="d089a6f2-cd88-47e5-aa11-55f60adfb977" diff --git a/makedist b/makedist index 6cf2a363f83a9f50024e788d280e81bc2302d81c4c98a3007ac4cfafdf106ee3..d3deac437e98cf95703388a95553f88008b9e9fe53b0631083aa490cb138ed9b 100755 --- a/makedist +++ b/makedist @@ -55,36 +55,64 @@ meta4ra-create -fn $tarball -mtime $tarball \ -sig-pgp $tarball.asc -sig-ssh $tarball.sig \ "1|ru|http://www.goredo.cypherpunks.su/download/$tarball" \ "1|gb|https://goredo.dabase.com/download/$tarball" \ - "2|ru|https://www.goredo.cypherpunks.su/download/$tarball" \ - "3|ru|http://y.www.goredo.cypherpunks.su/download/$tarball" \ - "3|ru|http://[322:3bd:cc26:9545:b00b:cbff:2b6e:2d38]/download/$tarball" \ - "ipfs://TODO/$tarball" <$tarball >$tarball.meta4 -meta4ra-create -add $tarball.meta4 -fn $tarball.asc -hashes "" \ + "2|ru|http://msk.www.goredo.cypherpunks.su/download/$tarball" \ + "2|ru|http://spb.www.goredo.cypherpunks.su/download/$tarball" \ + "3|ru|https://www.goredo.cypherpunks.su/download/$tarball" \ + "4|ru|https://msk.www.goredo.cypherpunks.su/download/$tarball" \ + "4|ru|https://spb.www.goredo.cypherpunks.su/download/$tarball" \ + "5|ru|http://y.www.goredo.cypherpunks.su/download/$tarball" \ + "5|ru|http://[322:3bd:cc26:9545:b00b:cbff:2b6e:2d38]/download/$tarball" \ + "6|ru|sftp://anonwww@msk.www.cypherpunks.su/goredo.cypherpunks.su/download/$tarball" \ + "6|ru|sftp://anonwww@spb.www.cypherpunks.su/goredo.cypherpunks.su/download/$tarball" \ + "ipfs://TODO/$tarball" \ + <$tarball >$tarball.meta4 +meta4ra-create -add $tarball.meta4 -fn $tarball.asc -hashers "" \ -id "LibrePGP detached signature" \ "1|ru|http://www.goredo.cypherpunks.su/download/$tarball.asc" \ "1|gb|https://goredo.dabase.com/download/$tarball.asc" \ - "2|ru|https://www.goredo.cypherpunks.su/download/$tarball.asc" \ - "3|ru|http://y.www.goredo.cypherpunks.su/download/$tarball.asc" \ - "3|ru|http://[322:3bd:cc26:9545:b00b:cbff:2b6e:2d38]/download/$tarball.asc" \ - "ipfs://TODO/$tarball.asc" <$tarball.asc >$tarball.meta4_ + "2|ru|http://msk.www.goredo.cypherpunks.su/download/$tarball.asc" \ + "2|ru|http://spb.www.goredo.cypherpunks.su/download/$tarball.asc" \ + "3|ru|https://www.goredo.cypherpunks.su/download/$tarball.asc" \ + "4|ru|https://msk.www.goredo.cypherpunks.su/download/$tarball.asc" \ + "4|ru|https://spb.www.goredo.cypherpunks.su/download/$tarball.asc" \ + "5|ru|http://y.www.goredo.cypherpunks.su/download/$tarball.asc" \ + "5|ru|http://[322:3bd:cc26:9545:b00b:cbff:2b6e:2d38]/download/$tarball.asc" \ + "6|ru|sftp://anonwww@msk.www.cypherpunks.su/goredo.cypherpunks.su/download/$tarball.asc" \ + "6|ru|sftp://anonwww@spb.www.cypherpunks.su/goredo.cypherpunks.su/download/$tarball.asc" \ + "ipfs://TODO/$tarball.asc" \ + <$tarball.asc >$tarball.meta4_ mv $tarball.meta4_ $tarball.meta4 -meta4ra-create -add $tarball.meta4 -fn $tarball.cm -hashes "" \ +meta4ra-create -add $tarball.meta4 -fn $tarball.cm -hashers "" \ -id "KEKS/CM detached signature" \ "1|ru|http://www.goredo.cypherpunks.su/download/$tarball.cm" \ "1|gb|https://goredo.dabase.com/download/$tarball.cm" \ - "2|ru|https://www.goredo.cypherpunks.su/download/$tarball.cm" \ - "3|ru|http://y.www.goredo.cypherpunks.su/download/$tarball.cm" \ - "3|ru|http://[322:3bd:cc26:9545:b00b:cbff:2b6e:2d38]/download/$tarball.cm" \ - "ipfs://TODO/$tarball.cm" <$tarball.cm >$tarball.meta4_ + "2|ru|http://msk.www.goredo.cypherpunks.su/download/$tarball.cm" \ + "2|ru|http://spb.www.goredo.cypherpunks.su/download/$tarball.cm" \ + "3|ru|https://www.goredo.cypherpunks.su/download/$tarball.cm" \ + "4|ru|https://msk.www.goredo.cypherpunks.su/download/$tarball.cm" \ + "4|ru|https://spb.www.goredo.cypherpunks.su/download/$tarball.cm" \ + "5|ru|http://y.www.goredo.cypherpunks.su/download/$tarball.cm" \ + "5|ru|http://[322:3bd:cc26:9545:b00b:cbff:2b6e:2d38]/download/$tarball.cm" \ + "6|ru|sftp://anonwww@msk.www.cypherpunks.su/goredo.cypherpunks.su/download/$tarball.cm" \ + "6|ru|sftp://anonwww@spb.www.cypherpunks.su/goredo.cypherpunks.su/download/$tarball.cm" \ + "ipfs://TODO/$tarball.cm" \ + <$tarball.cm >$tarball.meta4_ mv $tarball.meta4_ $tarball.meta4 -meta4ra-create -add $tarball.meta4 -fn $tarball.sig -hashes "" \ +meta4ra-create -add $tarball.meta4 -fn $tarball.sig -hashers "" \ -id "OpenSSH signature" \ "1|ru|http://www.goredo.cypherpunks.su/download/$tarball.sig" \ "1|gb|https://goredo.dabase.com/download/$tarball.sig" \ - "2|ru|https://www.goredo.cypherpunks.su/download/$tarball.sig" \ - "3|ru|http://y.www.goredo.cypherpunks.su/download/$tarball.sig" \ - "3|ru|http://[322:3bd:cc26:9545:b00b:cbff:2b6e:2d38]/download/$tarball.sig" \ - "ipfs://TODO/$tarball.sig" <$tarball.sig >$tarball.meta4_ + "2|ru|http://msk.www.goredo.cypherpunks.su/download/$tarball.sig" \ + "2|ru|http://spb.www.goredo.cypherpunks.su/download/$tarball.sig" \ + "3|ru|https://www.goredo.cypherpunks.su/download/$tarball.sig" \ + "4|ru|https://msk.www.goredo.cypherpunks.su/download/$tarball.sig" \ + "4|ru|https://spb.www.goredo.cypherpunks.su/download/$tarball.sig" \ + "5|ru|http://y.www.goredo.cypherpunks.su/download/$tarball.sig" \ + "5|ru|http://[322:3bd:cc26:9545:b00b:cbff:2b6e:2d38]/download/$tarball.sig" \ + "6|ru|sftp://anonwww@msk.www.cypherpunks.su/goredo.cypherpunks.su/download/$tarball.sig" \ + "6|ru|sftp://anonwww@spb.www.cypherpunks.su/goredo.cypherpunks.su/download/$tarball.sig" \ + "ipfs://TODO/$tarball.sig" \ + <$tarball.sig >$tarball.meta4_ mv $tarball.meta4_ $tarball.meta4 size=$(( $(stat -f %z $tarball) / 1024 )) @@ -126,8 +154,8 @@ http://www.goredo.cypherpunks.su/download/goredo-$release.tar.zst ($size KiB) http://www.goredo.cypherpunks.su/download/goredo-$release.tar.zst.{asc,sig,cm} -OpenPGP key: 7531 BB84 FAF0 BF35 960C 63B9 3A52 8DDE 952C 7E93 - goredo releases +LibrePGP key: 7531 BB84 FAF0 BF35 960C 63B9 3A52 8DDE 952C 7E93 + goredo releases OpenSSH key: SHA256:ddOaswnUBtNbuoEBYQtfcF59sR3Bvzo9pIfSlw9sKx8 KEKS/CM key: DB81E5A01871AA5715DD1AEBC2E712D8D31EAA088F3030427CAEF8CDEC9D15E1