Switch to go-arg cli parser

Also run go mod tidy and gomod2nix
doronbehar · Oct 20, 2021 · 8fa8278 · 8fa8278
1 parent 944a9af
commit 8fa8278
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 134 deletions.
diff --git a/Makefile b/Makefile
@@ -52,13 +52,13 @@ test: pistol
 	@echo -------------------
 	@echo ./tests/VERSION.bz2 should appear along with license of bz2
 	@echo -------------------
-	@./pistol --config tests/config tests/VERSION.bz2 -v -L
+	@./pistol --config tests/config tests/VERSION.bz2 -- -v -L
 	@tput sgr0
 	@echo -------------------
 	@echo ./tests/renovate.json5.bz2 should appear without a license of bz2
 	@echo or verbosity, although the arguments are passed to pistol
 	@echo -------------------
-	@./pistol --config tests/config tests/renovate.json5.bz2 -v -L
+	@./pistol --config tests/config tests/renovate.json5.bz2 -- -v -L
 	@echo -------------------
 	@echo Checks substitution of multiple pistol-extra arguments without
 	@echo a space between them \(issue 56\). The output should be:

diff --git a/cmd/pistol/main.go b/cmd/pistol/main.go
@@ -3,55 +3,49 @@ package main
 import (
 	"os"
 	"log"
-	"fmt"
 
 	"github.com/doronbehar/pistol"
-	"github.com/galdor/go-cmdline"
+	"github.com/alexflint/go-arg"
 	"github.com/adrg/xdg"
 )
+type args struct {
+	Config string `arg:"-c" help:"configuration file to use"`
+	FilePath string `arg:"positional"`
+	Extras []string `arg:"positional" help:"extra arguments passed to the command"`
+}
 
 var (
 	Version string
 )
+func (args) Version() string {
+	return Version
+}
 
 func main() {
 	// Setup logger
 	log.SetFlags(0)
 	log.SetPrefix(os.Args[0] + ": ")
-
-	// Setup cmdline arguments
-	cmd := cmdline.New()
-	cmd.AddOption("c", "config", "config file", fmt.Sprintf("configuration file to use (defaults to %s/pistol/pistol.conf)", xdg.ConfigHome))
-	cmd.AddFlag("V", "version", "Print version date and exit")
-	cmd.AddArgument("file", "the file to preview")
-	cmd.AddTrailingArguments("extras", "extra arguments passed to the command")
-	cmd.Parse(os.Args)
-
-	if cmd.IsOptionSet("version") {
-		fmt.Println(Version)
-		os.Exit(0)
-	}
+	var args args
 
 	// Handle configuration file path
 	xdgPaths := []string{"pistol/pistol.conf", "pistol.conf"}
 	for _, xdgPath := range xdgPaths {
 		defaultConfigPath, err := xdg.SearchConfigFile(xdgPath)
 		// if a file was found
 		if err == nil {
-			cmd.SetOptionDefault("config", defaultConfigPath)
+			args.Config = defaultConfigPath
 			break
 		}
 	}
-	configPath := cmd.OptionValue("config")
-	var extras []string
-	extras = cmd.TrailingArgumentsValues("extras")
+	// Setup cmdline arguments
+	arg.MustParse(&args)
 
 	// handle file argument with configuration
-	if len(cmd.ArgumentValue("file")) == 0 {
+	if len(args.FilePath) == 0 {
 		log.Fatalf("no arguments!")
 		os.Exit(1)
 	}
-	previewer, err := pistol.NewPreviewer(cmd.ArgumentValue("file"), configPath, extras)
+	previewer, err := pistol.NewPreviewer(args.FilePath, args.Config, args.Extras)
 	if err != nil {
 		log.Fatal(err)
 		os.Exit(2)

diff --git a/go.mod b/go.mod
@@ -4,20 +4,22 @@ go 1.12
 
 require (
 	github.com/adrg/xdg v0.3.3
-	github.com/alecthomas/chroma v0.9.2
-	github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 // indirect
+	github.com/akamensky/argparse v1.3.1 // indirect
+	github.com/alecthomas/chroma v0.9.4
 	github.com/alessio/shellescape v1.4.1
+	github.com/alexflint/go-arg v1.4.2 // indirect
+	github.com/alexflint/go-scalar v1.1.0 // indirect
 	github.com/andybalholm/brotli v1.0.3 // indirect
 	github.com/dustin/go-humanize v1.0.0
 	github.com/galdor/go-cmdline v1.1.1
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/klauspost/compress v1.13.3 // indirect
+	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/klauspost/pgzip v1.2.5 // indirect
 	github.com/mholt/archiver/v3 v3.5.0
 	github.com/nwaples/rardecode v1.1.2
 	github.com/pierrec/lz4/v4 v4.1.8 // indirect
 	github.com/rakyll/magicmime v0.1.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/ulikunitz/xz v0.5.10 // indirect
-	golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 // indirect
+	golang.org/x/sys v0.0.0-20211015200801-69063c4bb744 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -1,22 +1,19 @@
 github.com/adrg/xdg v0.3.3 h1:s/tV7MdqQnzB1nKY8aqHvAMD+uCiuEDzVB5HLRY849U=
 github.com/adrg/xdg v0.3.3/go.mod h1:61xAR2VZcggl2St4O9ohF5qCKe08+JDmE4VNzPFQvOQ=
-github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U=
-github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI=
-github.com/alecthomas/chroma v0.9.2 h1:yU1sE2+TZbLIQPMk30SolL2Hn53SR/Pv750f7qZ/XMs=
-github.com/alecthomas/chroma v0.9.2/go.mod h1:eMuEnpA18XbG/WhOWtCzJHS7WqEtDAI+HxdwoW0nVSk=
-github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VENNfmXvHbgYlbUOvpzYzvy2aZU5gXVeo=
-github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
-github.com/alecthomas/kong v0.2.4/go.mod h1:kQOmtJgV+Lb4aj+I2LEn40cbtawdWJ9Y8QLq+lElKxE=
-github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
-github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 h1:GDQdwm/gAcJcLAKQQZGOJ4knlw+7rfEQQcmwTbt4p5E=
-github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
+github.com/akamensky/argparse v1.3.1 h1:kP6+OyvR0fuBH6UhbE6yh/nskrDEIQgEA1SUXDPjx4g=
+github.com/akamensky/argparse v1.3.1/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA=
+github.com/alecthomas/chroma v0.9.4 h1:YL7sOAE3p8HS96T9km7RgvmsZIctqbK1qJ0b7hzed44=
+github.com/alecthomas/chroma v0.9.4/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
 github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0=
 github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
+github.com/alexflint/go-arg v1.4.2 h1:lDWZAXxpAnZUq4qwb86p/3rIJJ2Li81EoMbTMujhVa0=
+github.com/alexflint/go-arg v1.4.2/go.mod h1:9iRbDxne7LcR/GSvEr7ma++GLpdIU1zrghf2y2768kM=
+github.com/alexflint/go-scalar v1.0.0/go.mod h1:GpHzbCOZXEKMEcygYQ5n/aa4Aq84zbxjy3MxYW0gjYw=
+github.com/alexflint/go-scalar v1.1.0 h1:aaAouLLzI9TChcPXotr6gUhq+Scr8rl0P9P4PnltbhM=
+github.com/alexflint/go-scalar v1.1.0/go.mod h1:LoFvNMqS1CPrMVltza4LvnGKhaSpc3oyLEBUZVhhS2o=
 github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
 github.com/andybalholm/brotli v1.0.3 h1:fpcw+r1N1h0Poc1F/pHbW40cUm/lMEQslZtCkBQ0UnM=
 github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ=
-github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -30,20 +27,16 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn
 github.com/galdor/go-cmdline v1.1.1 h1:+mvSjZo4ZNterLC8Ft4zt9J5TgXJPfnoHZbTy1hYEUA=
 github.com/galdor/go-cmdline v1.1.1/go.mod h1:4F4ylJ9bgyWjcqjGgFYPoDCeKlGSCllihrWoHnQ9eHU=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.10.10/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/klauspost/compress v1.13.3 h1:BtAvtV1+h0YwSVwWoYXMREPpYu9VzTJ9QDI1TEg/iQQ=
-github.com/klauspost/compress v1.13.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
+github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
+github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/pgzip v1.2.4/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE=
 github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mholt/archiver/v3 v3.5.0 h1:nE8gZIrw66cu4osS/U7UW7YDuGMHssxKutU8IfWxwWE=
 github.com/mholt/archiver/v3 v3.5.0/go.mod h1:qqTTPUK/HZPFgFQ/TJ3BzvTpF/dPtFVJXdQbCmeMxwc=
 github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
@@ -52,19 +45,14 @@ github.com/nwaples/rardecode v1.1.2/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWk
 github.com/pierrec/lz4/v4 v4.0.3/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pierrec/lz4/v4 v4.1.8 h1:ieHkV+i2BRzngO4Wd/3HGowuZStgq6QkPsD1eolNAO4=
 github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rakyll/magicmime v0.1.0 h1:aFIp1DqgzjcB3FI7rQk6uZl73i1VPpWswab1YKU4CL4=
 github.com/rakyll/magicmime v0.1.0/go.mod h1:OKs4S+1GpIAB1PCebhwp3rxhyipe7TiImiIeVyFlQt8=
-github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
-github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
@@ -74,11 +62,8 @@ github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0o
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 h1:siQdpVirKtzPhKl3lZWozZraCFObP8S1v6PRp0bLrtU=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211015200801-69063c4bb744 h1:KzbpndAYEM+4oHRp9JmB2ewj0NHHxO3Z0g7Gus2O1kk=
+golang.org/x/sys v0.0.0-20211015200801-69063c4bb744/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=

diff --git a/gomod2nix.toml b/gomod2nix.toml
@@ -6,45 +6,21 @@
     rev = "11bedc8a87ab263bb3cba51d10e5ac70a0a7e3f2"
     sha256 = "1h11myyy426qrz96h9jrl7r1n8xwd5ybcr9c4s8l2pxn86dn5jsy"
 
-["github.com/alecthomas/assert"]
-  sumVersion = "v0.0.0-20170929043011-405dbfeb8e38"
-  ["github.com/alecthomas/assert".fetch]
+["github.com/akamensky/argparse"]
+  sumVersion = "v1.3.1"
+  ["github.com/akamensky/argparse".fetch]
     type = "git"
-    url = "https://github.com/alecthomas/assert"
-    rev = "405dbfeb8e38effee6e723317226e93fff912d06"
-    sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"
+    url = "https://github.com/akamensky/argparse"
+    rev = "6bd6f07ff2a3fe7ef2d1f5c627566ba386fd54a7"
+    sha256 = "0h3wyskisr2m0ygnl7dsq7r43s88iqdd2j8gcilf3g8p530gwgy2"
 
 ["github.com/alecthomas/chroma"]
-  sumVersion = "v0.9.2"
+  sumVersion = "v0.9.4"
   ["github.com/alecthomas/chroma".fetch]
     type = "git"
     url = "https://github.com/alecthomas/chroma"
-    rev = "841c391b989a17068356dbcd5dec330ed433c04d"
-    sha256 = "0b6llkhl0ga8228wzcjyv3yn7nq18r0qdaw761v97vwk705b8l7y"
-
-["github.com/alecthomas/colour"]
-  sumVersion = "v0.0.0-20160524082231-60882d9e2721"
-  ["github.com/alecthomas/colour".fetch]
-    type = "git"
-    url = "https://github.com/alecthomas/colour"
-    rev = "60882d9e27213e8552dcff6328914fe4c2b44bc9"
-    sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"
-
-["github.com/alecthomas/kong"]
-  sumVersion = "v0.2.4"
-  ["github.com/alecthomas/kong".fetch]
-    type = "git"
-    url = "https://github.com/alecthomas/kong"
-    rev = "109dce7ea5d32e63a96a2c234e991ea3ea470e77"
-    sha256 = "0lv8xk71p5729igwmp6slhmf9x1g5z3zmkfx1mg1y2spn2ck4q7l"
-
-["github.com/alecthomas/repr"]
-  sumVersion = "v0.0.0-20181024024818-d37bc2a10ba1"
-  ["github.com/alecthomas/repr".fetch]
-    type = "git"
-    url = "https://github.com/alecthomas/repr"
-    rev = "d37bc2a10ba1a7951e19dd5dc10f7d59b142d8d7"
-    sha256 = "0jnx1ypdl4zi010ds2z857ajkr5cx51wkx950rfqb126hvql7svx"
+    rev = "6520148857c2ae3106ff371e527abea815b23915"
+    sha256 = "1iy6mymdjxbl5wbll1mivv7gqdyqhl6xpfqps99z307m7y38r1ni"
 
 ["github.com/alessio/shellescape"]
   sumVersion = "v1.4.1"
@@ -54,6 +30,22 @@
     rev = "be0896646a3f2d59dc1de4d149beb07c5b2c25c0"
     sha256 = "14zypi8qdxl77lks5b9jshr17idrm4sri1rxgpw5q4dys1palddd"
 
+["github.com/alexflint/go-arg"]
+  sumVersion = "v1.4.2"
+  ["github.com/alexflint/go-arg".fetch]
+    type = "git"
+    url = "https://github.com/alexflint/go-arg"
+    rev = "eb0393e9bc0bbd8d3cc37a6ee98c1d538e4e5c91"
+    sha256 = "1f2z6i2n9niy6wypd41ikzizws7bl43fr852z4af5hd41dynx6p0"
+
+["github.com/alexflint/go-scalar"]
+  sumVersion = "v1.1.0"
+  ["github.com/alexflint/go-scalar".fetch]
+    type = "git"
+    url = "https://github.com/alexflint/go-scalar"
+    rev = "fd60e966956efb1720cbfbf449fb55971209b2db"
+    sha256 = "1996wynw6xl99q1glciqckddncclp9hzp2jdvl6d1vw41svc4z2z"
+
 ["github.com/andybalholm/brotli"]
   sumVersion = "v1.0.3"
   ["github.com/andybalholm/brotli".fetch]
@@ -62,14 +54,6 @@
     rev = "5376c15dde3fd4247febd5a3b4ac9708d2d6faff"
     sha256 = "16y3z6rpi0a699vh9sxmdj4w2hvb5dvmci8wc9y6dsi8j6sxpmw3"
 
-["github.com/danwakefield/fnmatch"]
-  sumVersion = "v0.0.0-20160403171240-cbb64ac3d964"
-  ["github.com/danwakefield/fnmatch".fetch]
-    type = "git"
-    url = "https://github.com/danwakefield/fnmatch"
-    rev = "cbb64ac3d964b81592e64f957ad53df015803288"
-    sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz"
-
 ["github.com/davecgh/go-spew"]
   sumVersion = "v1.1.1"
   ["github.com/davecgh/go-spew".fetch]
@@ -127,12 +111,12 @@
     sha256 = "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j"
 
 ["github.com/klauspost/compress"]
-  sumVersion = "v1.13.3"
+  sumVersion = "v1.13.6"
   ["github.com/klauspost/compress".fetch]
     type = "git"
     url = "https://github.com/klauspost/compress"
-    rev = "6c2ac28c4d87d3208a576e17abb803e809a0558f"
-    sha256 = "16lhvvfc29bx3zrfs05282iq9zggbdydffs48mbwi80vxp362vhx"
+    rev = "38d4ba985ac157cb858763e016645e14e74c13c4"
+    sha256 = "1bgqhv2pp56b8f5mfzpfjlm4cb262gjbqbp3235blhj9xf2wrynj"
 
 ["github.com/klauspost/cpuid"]
   sumVersion = "v1.2.0"
@@ -150,22 +134,6 @@
     rev = "52335df0e96fa9c509c6fa2966697620beef6dc3"
     sha256 = "0m66jcsz27076qvi5qzagzlbyd1sdzh6kbf1njj0sswx86026rx3"
 
-["github.com/mattn/go-colorable"]
-  sumVersion = "v0.1.6"
-  ["github.com/mattn/go-colorable".fetch]
-    type = "git"
-    url = "https://github.com/mattn/go-colorable"
-    rev = "68e95eba382c972aafde02ead2cd2426a8a92480"
-    sha256 = "0zv9ix7g0qf71jdhv7gbab9hjfkgbxl22kwhpz9ck1y6m4g1zxaw"
-
-["github.com/mattn/go-isatty"]
-  sumVersion = "v0.0.12"
-  ["github.com/mattn/go-isatty".fetch]
-    type = "git"
-    url = "https://github.com/mattn/go-isatty"
-    rev = "7b513a986450394f7bbf1476909911b3aa3a55ce"
-    sha256 = "1dfsh27d52wmz0nmmzm2382pfrs2fcijvh6cgir7jbb4pnigr5w4"
-
 ["github.com/mholt/archiver/v3"]
   sumVersion = "v3.5.0"
   ["github.com/mholt/archiver/v3".fetch]
@@ -190,14 +158,6 @@
     rev = "2c1550e56c43e875151468b8f6380ac8d706e88e"
     sha256 = "1ffsm2ny2v6nasc3zww5f2bl0jqi2jmiyqm8x2cvyzrd0clay1wl"
 
-["github.com/pkg/errors"]
-  sumVersion = "v0.9.1"
-  ["github.com/pkg/errors".fetch]
-    type = "git"
-    url = "https://github.com/pkg/errors"
-    rev = "614d223910a179a466c1767a985424175c39b465"
-    sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"
-
 ["github.com/pmezard/go-difflib"]
   sumVersion = "v1.0.0"
   ["github.com/pmezard/go-difflib".fetch]
@@ -214,14 +174,6 @@
     rev = "9b99294d6b2216897632b9734769d8ce4568681e"
     sha256 = "0agvbqy370v4qh3jb33f5h7jp3rg1y771aakk4y3din8kbkj7hc9"
 
-["github.com/sergi/go-diff"]
-  sumVersion = "v1.0.0"
-  ["github.com/sergi/go-diff".fetch]
-    type = "git"
-    url = "https://github.com/sergi/go-diff"
-    rev = "1744e2970ca51c86172c8190fadad617561ed6e7"
-    sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"
-
 ["github.com/sirupsen/logrus"]
   sumVersion = "v1.8.1"
   ["github.com/sirupsen/logrus".fetch]
@@ -263,12 +215,12 @@
     sha256 = "178r0fa2dpzxf0sabs7dn0c8fa7vs87zlxk6spkn374ls9pir7nq"
 
 ["golang.org/x/sys"]
-  sumVersion = "v0.0.0-20210806184541-e5e7981a1069"
+  sumVersion = "v0.0.0-20211015200801-69063c4bb744"
   ["golang.org/x/sys".fetch]
     type = "git"
     url = "https://go.googlesource.com/sys"
-    rev = "e5e7981a10699f0af2ffea4c0e0f542e447b2e4a"
-    sha256 = "0w1w5k9ar8ry3g7xmwsyx938b7f24krvk5cliiglk8ca1z2lcgpd"
+    rev = "69063c4bb744bc56492b1a0533d73a23406b0bc2"
+    sha256 = "1a7i6cklsa0x8bv71vqf8x5wmzf6vdsy9iycr656wsa4bp54g0vy"
 
 ["gopkg.in/check.v1"]
   sumVersion = "v0.0.0-20161208181325-20d25e280405"