Merge pull request #282 from rsteube/pacman-fix-subcommand

pacman: fix subcommand flag

Author: rsteube

completers/pacman_completer/cmd/root.go

@@ -22,7 +22,7 @@ func init() {
 
 	cmd, _, _ := rootCmd.Find([]string{"_carapace"})
 	cmd.PreRun = func(cmd *cobra.Command, args []string) {
-		if len(args) < 4 || !regexp.MustCompile("-[^-]").MatchString(args[3]) {
+		if len(args) < 4 || (len(args) == 4 && regexp.MustCompile("^--?").MatchString(args[3])) {
 			rootCmd.Flags().BoolP("database", "D", false, "Operate on the package database")
 			rootCmd.Flags().BoolP("deptest", "T", false, "Check dependencies")
 			rootCmd.Flags().BoolP("files", "F", false, "Query the files database")

go.mod

@@ -6,9 +6,8 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/go-ps v1.0.0
 	github.com/pelletier/go-toml v1.8.1
-	github.com/rsteube/carapace v0.3.7
+	github.com/rsteube/carapace v0.3.8
 	github.com/spf13/cobra v1.1.1
-	github.com/spf13/pflag v1.0.5
 	gopkg.in/ini.v1 v1.62.0
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
 )

go.sum

@@ -151,8 +151,8 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rsteube/carapace v0.3.7 h1:LHjiJaGjPUK3LChngvHDOjO11QJ9jqUlDfa/J1IhJC0=
-github.com/rsteube/carapace v0.3.7/go.mod h1:KFUcTCOChx8NdnMn7+l/3/ty+BLt+I3ciWnBwoT/OQk=
+github.com/rsteube/carapace v0.3.8 h1:Tir8haipGCvfyWlLTPv/zGWJFA1NkUmQj+pXFOIUHfE=
+github.com/rsteube/carapace v0.3.8/go.mod h1:KFUcTCOChx8NdnMn7+l/3/ty+BLt+I3ciWnBwoT/OQk=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=