From 96c7dddd5295f66969470a8c70b9566e3e91834d Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Mon, 20 Mar 2023 12:59:15 +0300 Subject: [PATCH] No need to hardcode UnZSTDPath during compilation --- cmd/tofuproxy/main.go | 3 +++ cmd/warc-extract/main.go | 2 ++ 2 files changed, 5 insertions(+) diff --git a/cmd/tofuproxy/main.go b/cmd/tofuproxy/main.go index babc8b7..ddfa477 100644 --- a/cmd/tofuproxy/main.go +++ b/cmd/tofuproxy/main.go @@ -29,6 +29,7 @@ import ( "go.stargrave.org/tofuproxy/fifos" "go.stargrave.org/tofuproxy/rounds" ttls "go.stargrave.org/tofuproxy/tls" + "go.stargrave.org/tofuproxy/warc" ) func main() { @@ -42,6 +43,7 @@ func main() { fifosDir := flag.String("fifos", "fifos", "Directory with FIFOs") notai := flag.Bool("notai", false, "Do not prepend TAI64N to logs") warcOnly := flag.Bool("warc-only", false, "Server only WARC URIs") + unzstdPath := flag.String("unzstd", "cmd/zstd/unzstd", "Path to unzstd utility") flag.Parse() log.SetFlags(log.Lshortfile) @@ -64,6 +66,7 @@ func main() { tofuproxy.CAPrv = caPrv tofuproxy.X509Algo = *ai rounds.WARCOnly = *warcOnly + warc.UnZSTDPath = *unzstdPath ln, err := net.Listen("tcp", *bind) if err != nil { diff --git a/cmd/warc-extract/main.go b/cmd/warc-extract/main.go index 7389e06..d207273 100644 --- a/cmd/warc-extract/main.go +++ b/cmd/warc-extract/main.go @@ -36,8 +36,10 @@ func main() { hdr := flag.Bool("hdr", false, "Also extract WARC's header") idx := flag.Bool("idx", false, "Save WARC indices") recompress := flag.Bool("for-enzstd", false, "Output for enzstd utility") + unzstdPath := flag.String("unzstd", "cmd/zstd/unzstd", "Path to unzstd utility") flag.Parse() log.SetFlags(log.Lshortfile) + warc.UnZSTDPath = *unzstdPath if *recompress { var hdr bytes.Buffer -- 2.44.0