bin/meta4ra-hashes-detect | 4 ++-- cmd/meta4ra/create.go | 2 +- cmd/meta4ra/hash.go | 2 +- contrib/mk-meta4 | 2 +- makedist | 4 ++-- diff --git a/bin/meta4ra-hashes-detect b/bin/meta4ra-hashes-detect index bffc22d6e2586d473e8a637c6810d870d258a3b424a7c89d4ac3744892f7ea5d..45071a41816a5f9df89fdea80fc4b981134d7f88ef3b6b3d16b97f54593d9c17 100755 --- a/bin/meta4ra-hashes-detect +++ b/bin/meta4ra-hashes-detect @@ -36,13 +36,13 @@ check skein-512 builtin || : HSH=3a9159f071e4dd1c8c4f968607c30942e120d8156b8b1e72e0d376e8871cb8b8 check shake128 goshake128 || # go.stargrave.org/gosha3 -check shake128 "sha3sum -a 128000 | dd bs=1 count=64 2> /dev/null" || # p5-Digest-SHA3 +check shake128 "sha3sum -a 128000 | dd bs=1 count=64 2>/dev/null" || # p5-Digest-SHA3 check shake128 builtin || : # openssl shake128 -- useless, as it outputs only 128 bits HSH=369771bb2cb9d2b04c1d54cca487e372d9f187f73f7ba3f65b95c8ee7798c527f4f3c2d55c2d46a29f2e945d469c3df27853a8735271f5cc2d9e889544357116 check shake256 goshake256 || -check shake256 "sha3sum -a 256000 | dd bs=1 count=128 2> /dev/null" || +check shake256 "sha3sum -a 256000 | dd bs=1 count=128 2>/dev/null" || check shake256 builtin || : HSH=309ecc489c12d6eb4cc40f50c902f2b4d0ed77ee511a7c7a9bcd3ca86d4cd86f989dd35bc5ff499670da34255b45b0cfd830e81f605dcf7dc5542e93ae9cd76f diff --git a/cmd/meta4ra/create.go b/cmd/meta4ra/create.go index 0641d87af53978d3882ca1c6561adf94fe96a9ef0ca15ad7b383ecc1e79c5934..30a3777838f9c504e815955f3c9eb0089448699440c3524207647bad90211301 100644 --- a/cmd/meta4ra/create.go +++ b/cmd/meta4ra/create.go @@ -46,7 +46,7 @@ "Do not include Generator field") torrent := flag.String("torrent", "", "Torrent URL") flag.Usage = func() { fmt.Fprintf(flag.CommandLine.Output(), - "Usage: %s [options] [URL ...] < data > data.meta4\n", os.Args[0]) + "Usage: %s [options] [URL ...] data.meta4\n", os.Args[0]) flag.PrintDefaults() } flag.Parse() diff --git a/cmd/meta4ra/hash.go b/cmd/meta4ra/hash.go index d85ad67e923c69f8e3b9ac5a09a32d475f30808ba4355f3c88fd36d08b02af59..d86469167e19beb82a92c68b432eb1e6411d415bc69dba8b7395bdf03184652f 100644 --- a/cmd/meta4ra/hash.go +++ b/cmd/meta4ra/hash.go @@ -32,7 +32,7 @@ hashes := flag.String("hashes", meta4ra.HashesDefault, "hash-name:commandline[,...]") flag.Usage = func() { fmt.Fprintf(flag.CommandLine.Output(), - "Usage: %s [-hashes ...] < data | read hash name\n", os.Args[0]) + "Usage: %s [-hashes ...] "$f".$ext + meta4ra-create $opts -hashes "$hashes" -fn "$f" -mtime "$f" >"$f".$ext done diff --git a/makedist b/makedist index b45db5054d67ee3a7a37415498b35b3a1015869dbd12650d38bd61593311061f..b3d4f4ea4cb6bc67e2d9b3c184d2d666987435107ccfa078d279f8b198b51c57 100755 --- a/makedist +++ b/makedist @@ -9,7 +9,7 @@ git clone . $tmp/meta4ra-$release cd $tmp/meta4ra-$release git checkout v$release -echo v$release > VERSION +echo v$release >VERSION go mod vendor find . -name .gitignore -delete @@ -27,6 +27,6 @@ ssh-keygen -Y sign -f ~/.ssh/sign/meta4ra@stargrave.org -n file $tarball meta4ra-create -fn "$tarball" -mtime "$tarball" \ -sig-ssh "$tarball".sig \ http://www.meta4ra.stargrave.org/download/"$tarball" \ - http://y.www.meta4ra.stargrave.org/download/"$tarball" < "$tarball" > "$tarball".meta4 + http://y.www.meta4ra.stargrave.org/download/"$tarball" <"$tarball" >"$tarball".meta4 mv $tmp/$tarball $tarball.meta4 $cur/www/download