No need to hardcode UnZSTDPath during compilation

diff --git a/cmd/tofuproxy/main.go b/cmd/tofuproxy/main.go
index babc8b7e34c34f3cfbe76d7ad9601e4d4edce9d6..ddfa4771d74b910cd82e38855300311b866a7f3c 100644 (file)
--- 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 7389e069d29d0027d513a62cd955ab5635cec790..d207273e2ee95f8d349ae3ae16607ce2bcf09c07 100644 (file)
--- 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