pacman: added missing flags

carapace-sh · Nov 30, 2022 · bc5a289 · bc5a289
1 parent 55206c7
commit bc5a289
Show file tree

Hide file tree

Showing 13 changed files with 214 additions and 115 deletions.
diff --git a/completers/downgrade_completer/cmd/root.go b/completers/downgrade_completer/cmd/root.go
@@ -38,7 +38,7 @@ func init() {
 
 	carapace.Gen(rootCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return pacman.ActionPackages(pacman.PackageOption{Explicit: true}).Invoke(c).Filter(c.Args).ToA()
+			return pacman.ActionPackages().Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/pacman_completer/cmd/database.go b/completers/pacman_completer/cmd/database.go
@@ -11,34 +11,38 @@ func initDatabaseCmd(cmd *cobra.Command) {
 	cmd.Flags().String("arch", "", "set an alternate architecture")
 	cmd.Flags().Bool("asdeps", false, "mark packages as non-explicitly installed")
 	cmd.Flags().Bool("asexplicit", false, "mark packages as explicitly installed")
-	cmd.Flags().BoolP("check", "k", false, "test local database for validity (-kk for sync databases)")
+	cmd.Flags().String("cachedir", "", "set an alternate package cache location")
+	cmd.Flags().CountP("check", "k", "test local database for validity (-kk for sync databases)")
 	cmd.Flags().String("color", "", "colorize the output")
 	cmd.Flags().String("config", "", "set an alternate configuration file")
 	cmd.Flags().Bool("confirm", false, "always ask for confirmation")
 	cmd.Flags().StringP("dbpath", "b", "", "set an alternate database location")
 	cmd.Flags().Bool("debug", false, "display debug messages")
-	cmd.Flags().Bool("disable-download-timeout", false, "")
+	cmd.Flags().Bool("disable-download-timeout", false, "use relaxed timeouts for download")
 	cmd.Flags().String("gpgdir", "", "set an alternate home directory for GnuPG")
 	cmd.Flags().String("hookdir", "", "set an alternate hook location")
+	cmd.Flags().String("logfile", "", "set an alternate log file")
 	cmd.Flags().Bool("noconfirm", false, "do not ask for any confirmation")
 	cmd.Flags().BoolP("quiet", "q", false, "suppress output of success messages")
 	cmd.Flags().StringP("root", "r", "", "set an alternate installation root")
 	cmd.Flags().Bool("sysroot", false, "operate on a mounted guest system (root-only)")
 	cmd.Flags().BoolP("verbose", "v", false, "be verbose")
 
 	carapace.Gen(cmd).FlagCompletion(carapace.ActionMap{
-		"arch":    carapace.ActionValues("i686", "x86_64"),
-		"color":   carapace.ActionValues("auto", "never", "always").StyleF(style.ForKeyword),
-		"config":  carapace.ActionFiles(),
-		"dbpath":  carapace.ActionFiles(),
-		"gpgdir":  carapace.ActionDirectories(),
-		"hookdir": carapace.ActionDirectories(),
-		"root":    carapace.ActionDirectories(),
+		"arch":     carapace.ActionValues("i686", "x86_64"),
+		"cachedir": carapace.ActionDirectories(),
+		"color":    carapace.ActionValues("auto", "never", "always").StyleF(style.ForKeyword),
+		"config":   carapace.ActionFiles(),
+		"dbpath":   carapace.ActionFiles(),
+		"gpgdir":   carapace.ActionDirectories(),
+		"hookdir":  carapace.ActionDirectories(),
+		"logfile":  carapace.ActionFiles(),
+		"root":     carapace.ActionDirectories(),
 	})
 
 	carapace.Gen(cmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return pacman.ActionPackages(pacman.PackageOption{}).Invoke(c).Filter(c.Args).ToA()
+			return pacman.ActionPackages().Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/pacman_completer/cmd/deptest.go b/completers/pacman_completer/cmd/deptest.go
@@ -9,32 +9,36 @@ import (
 
 func initDeptestCmd(cmd *cobra.Command) {
 	cmd.Flags().String("arch", "", "set an alternate architecture")
+	cmd.Flags().String("cachedir", "", "set an alternate package cache location")
 	cmd.Flags().String("color", "", "colorize the output")
 	cmd.Flags().String("config", "", "set an alternate configuration file")
 	cmd.Flags().Bool("confirm", false, "always ask for confirmation")
 	cmd.Flags().StringP("dbpath", "b", "", "set an alternate database location")
 	cmd.Flags().Bool("debug", false, "display debug messages")
-	cmd.Flags().Bool("disable-download-timeout", false, "")
+	cmd.Flags().Bool("disable-download-timeout", false, "use relaxed timeouts for download")
 	cmd.Flags().String("gpgdir", "", "set an alternate home directory for GnuPG")
 	cmd.Flags().String("hookdir", "", "set an alternate hook location")
+	cmd.Flags().String("logfile", "", "set an alternate log file")
 	cmd.Flags().Bool("noconfirm", false, "do not ask for any confirmation")
 	cmd.Flags().StringP("root", "r", "", "set an alternate installation root")
 	cmd.Flags().Bool("sysroot", false, "operate on a mounted guest system (root-only)")
 	cmd.Flags().BoolP("verbose", "v", false, "be verbose")
 
 	carapace.Gen(cmd).FlagCompletion(carapace.ActionMap{
-		"arch":    carapace.ActionValues("i686", "x86_64"),
-		"color":   carapace.ActionValues("auto", "never", "always").StyleF(style.ForKeyword),
-		"config":  carapace.ActionFiles(),
-		"dbpath":  carapace.ActionFiles(),
-		"gpgdir":  carapace.ActionDirectories(),
-		"hookdir": carapace.ActionDirectories(),
-		"root":    carapace.ActionDirectories(),
+		"arch":     carapace.ActionValues("i686", "x86_64"),
+		"cachedir": carapace.ActionDirectories(),
+		"color":    carapace.ActionValues("auto", "never", "always").StyleF(style.ForKeyword),
+		"config":   carapace.ActionFiles(),
+		"dbpath":   carapace.ActionFiles(),
+		"gpgdir":   carapace.ActionDirectories(),
+		"hookdir":  carapace.ActionDirectories(),
+		"logfile":  carapace.ActionFiles(),
+		"root":     carapace.ActionDirectories(),
 	})
 
 	carapace.Gen(cmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return pacman.ActionPackages(pacman.PackageOption{}).Invoke(c).Filter(c.Args).ToA()
+			return pacman.ActionPackages().Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/pacman_completer/cmd/files.go b/completers/pacman_completer/cmd/files.go
@@ -9,37 +9,41 @@ import (
 
 func initFilesCmd(cmd *cobra.Command) {
 	cmd.Flags().String("arch", "", "set an alternate architecture")
+	cmd.Flags().String("cachedir", "", "set an alternate package cache location")
 	cmd.Flags().String("color", "", "colorize the output")
 	cmd.Flags().String("config", "", "set an alternate configuration file")
 	cmd.Flags().Bool("confirm", false, "always ask for confirmation")
 	cmd.Flags().StringP("dbpath", "b", "", "set an alternate database location")
 	cmd.Flags().Bool("debug", false, "display debug messages")
-	cmd.Flags().Bool("disable-download-timeout", false, "")
+	cmd.Flags().Bool("disable-download-timeout", false, "use relaxed timeouts for download")
 	cmd.Flags().String("gpgdir", "", "set an alternate home directory for GnuPG")
 	cmd.Flags().String("hookdir", "", "set an alternate hook location")
 	cmd.Flags().BoolP("list", "l", false, "list the files owned by the queried package")
-	cmd.Flags().Bool("machinereadable", false, "")
+	cmd.Flags().String("logfile", "", "set an alternate log file")
+	cmd.Flags().Bool("machinereadable", false, "produce machine-readable output")
 	cmd.Flags().Bool("noconfirm", false, "do not ask for any confirmation")
 	cmd.Flags().BoolP("quiet", "q", false, "show less information for query and search")
-	cmd.Flags().BoolP("refresh", "y", false, "download fresh package databases from the server")
+	cmd.Flags().CountP("refresh", "y", "download fresh package databases from the server")
 	cmd.Flags().BoolP("regex", "x", false, "enable searching using regular expressions")
 	cmd.Flags().StringP("root", "r", "", "set an alternate installation root")
 	cmd.Flags().Bool("sysroot", false, "operate on a mounted guest system (root-only)")
 	cmd.Flags().BoolP("verbose", "v", false, "be verbose")
 
 	carapace.Gen(cmd).FlagCompletion(carapace.ActionMap{
-		"arch":    carapace.ActionValues("i686", "x86_64"),
-		"color":   carapace.ActionValues("auto", "never", "always").StyleF(style.ForKeyword),
-		"config":  carapace.ActionFiles(),
-		"dbpath":  carapace.ActionFiles(),
-		"gpgdir":  carapace.ActionDirectories(),
-		"hookdir": carapace.ActionDirectories(),
-		"root":    carapace.ActionDirectories(),
+		"arch":     carapace.ActionValues("i686", "x86_64"),
+		"cachedir": carapace.ActionDirectories(),
+		"color":    carapace.ActionValues("auto", "never", "always").StyleF(style.ForKeyword),
+		"config":   carapace.ActionFiles(),
+		"dbpath":   carapace.ActionFiles(),
+		"gpgdir":   carapace.ActionDirectories(),
+		"hookdir":  carapace.ActionDirectories(),
+		"logfile":  carapace.ActionFiles(),
+		"root":     carapace.ActionDirectories(),
 	})
 
 	carapace.Gen(cmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return pacman.ActionPackages(pacman.PackageOption{}).Invoke(c).Filter(c.Args).ToA()
+			return pacman.ActionPackages().Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/pacman_completer/cmd/query.go b/completers/pacman_completer/cmd/query.go
@@ -9,46 +9,56 @@ import (
 
 func initQueryCmd(cmd *cobra.Command) {
 	cmd.Flags().String("arch", "", "set an alternate architecture")
+	cmd.Flags().String("cachedir", "", "set an alternate package cache location")
 	cmd.Flags().BoolP("changelog", "c", false, "view the changelog of a package")
-	cmd.Flags().BoolP("check", "k", false, "check that package files exist (-kk for file properties)")
+	cmd.Flags().CountP("check", "k", "check that package files exist (-kk for file properties)")
 	cmd.Flags().String("color", "", "colorize the output")
 	cmd.Flags().String("config", "", "set an alternate configuration file")
 	cmd.Flags().Bool("confirm", false, "always ask for confirmation")
 	cmd.Flags().StringP("dbpath", "b", "", "set an alternate database location")
 	cmd.Flags().Bool("debug", false, "display debug messages")
 	cmd.Flags().BoolP("deps", "d", false, "list packages installed as dependencies [filter]")
-	cmd.Flags().Bool("disable-download-timeout", false, "")
+	cmd.Flags().Bool("disable-download-timeout", false, "use relaxed timeouts for download")
 	cmd.Flags().BoolP("explicit", "e", false, "list packages explicitly installed [filter]")
+	cmd.Flags().StringP("file", "p", "", "query a package file instead of the database")
 	cmd.Flags().BoolP("foreign", "m", false, "list installed packages not found in sync db(s) [filter]")
 	cmd.Flags().String("gpgdir", "", "set an alternate home directory for GnuPG")
 	cmd.Flags().BoolP("groups", "g", false, "view all members of a package group")
 	cmd.Flags().String("hookdir", "", "set an alternate hook location")
-	cmd.Flags().BoolP("info", "i", false, "view package information (-ii for backup files)")
+	cmd.Flags().CountP("info", "i", "view package information (-ii for backup files)")
 	cmd.Flags().BoolP("list", "l", false, "list the files owned by the queried package")
+	cmd.Flags().String("logfile", "", "set an alternate log file")
 	cmd.Flags().BoolP("native", "n", false, "list installed packages only found in sync db(s) [filter]")
 	cmd.Flags().Bool("noconfirm", false, "do not ask for any confirmation")
 	cmd.Flags().StringP("owns", "o", "", "query the package that owns <file>")
 	cmd.Flags().BoolP("quiet", "q", false, "show less information for query and search")
 	cmd.Flags().StringP("root", "r", "", "set an alternate installation root")
+	cmd.Flags().StringP("search", "s", "", "search locally-installed packages for matching strings")
 	cmd.Flags().Bool("sysroot", false, "operate on a mounted guest system (root-only)")
-	cmd.Flags().BoolP("unrequired", "t", false, "list packages not (optionally) required by any")
+	cmd.Flags().CountP("unrequired", "t", "list packages not (optionally) required by any package")
 	cmd.Flags().BoolP("upgrades", "u", false, "list outdated packages [filter]")
 	cmd.Flags().BoolP("verbose", "v", false, "be verbose")
 
 	carapace.Gen(cmd).FlagCompletion(carapace.ActionMap{
-		"arch":    carapace.ActionValues("i686", "x86_64"),
-		"color":   carapace.ActionValues("auto", "never", "always").StyleF(style.ForKeyword),
-		"config":  carapace.ActionFiles(),
-		"dbpath":  carapace.ActionFiles(),
-		"gpgdir":  carapace.ActionDirectories(),
-		"hookdir": carapace.ActionDirectories(),
-		"owns":    carapace.ActionFiles(),
-		"root":    carapace.ActionDirectories(),
+		"arch":     carapace.ActionValues("i686", "x86_64"),
+		"cachedir": carapace.ActionDirectories(),
+		"color":    carapace.ActionValues("auto", "never", "always").StyleF(style.ForKeyword),
+		"config":   carapace.ActionFiles(),
+		"dbpath":   carapace.ActionFiles(),
+		"file":     carapace.ActionFiles(),
+		"gpgdir":   carapace.ActionDirectories(),
+		"hookdir":  carapace.ActionDirectories(),
+		"logfile":  carapace.ActionFiles(),
+		"owns":     carapace.ActionFiles(),
+		"root":     carapace.ActionDirectories(),
 	})
 
 	carapace.Gen(cmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return pacman.ActionPackages(pacman.PackageOption{}).Invoke(c).Filter(c.Args).ToA()
+			if cmd.Flag("file").Changed {
+				return carapace.ActionFiles()
+			}
+			return pacman.ActionPackages().Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/pacman_completer/cmd/remove.go b/completers/pacman_completer/cmd/remove.go
@@ -9,43 +9,47 @@ import (
 
 func initRemoveCmd(cmd *cobra.Command) {
 	cmd.Flags().String("arch", "", "set an alternate architecture")
-	cmd.Flags().String("assume-installed", "", "")
+	cmd.Flags().String("assume-installed", "", "add a virtual package to satisfy dependencies")
+	cmd.Flags().String("cachedir", "", "set an alternate package cache location")
 	cmd.Flags().BoolP("cascade", "c", false, "remove packages and all packages that depend on them")
 	cmd.Flags().String("color", "", "colorize the output")
 	cmd.Flags().String("config", "", "set an alternate configuration file")
 	cmd.Flags().Bool("confirm", false, "always ask for confirmation")
 	cmd.Flags().Bool("dbonly", false, "only modify database entries, not package files")
 	cmd.Flags().StringP("dbpath", "b", "", "set an alternate database location")
 	cmd.Flags().Bool("debug", false, "display debug messages")
-	cmd.Flags().Bool("disable-download-timeout", false, "")
+	cmd.Flags().Bool("disable-download-timeout", false, "use relaxed timeouts for download")
 	cmd.Flags().String("gpgdir", "", "set an alternate home directory for GnuPG")
 	cmd.Flags().String("hookdir", "", "set an alternate hook location")
+	cmd.Flags().String("logfile", "", "set an alternate log file")
 	cmd.Flags().Bool("noconfirm", false, "do not ask for any confirmation")
-	cmd.Flags().BoolP("nodeps", "d", false, "skip dependency version checks (-dd to skip all checks)")
+	cmd.Flags().CountP("nodeps", "d", "skip dependency version checks (-dd to skip all checks)")
 	cmd.Flags().Bool("noprogressbar", false, "do not show a progress bar when downloading files")
 	cmd.Flags().BoolP("nosave", "n", false, "remove configuration files")
 	cmd.Flags().Bool("noscriptlet", false, "do not execute the install scriptlet if one exists")
 	cmd.Flags().BoolP("print", "p", false, "print the targets instead of performing the operation")
-	cmd.Flags().String("print-format", "", "")
-	cmd.Flags().BoolP("recursive", "s", false, "remove unnecessary dependencies")
+	cmd.Flags().String("print-format", "", "specify how the targets should be printed")
+	cmd.Flags().CountP("recursive", "s", "remove unnecessary dependencies")
 	cmd.Flags().StringP("root", "r", "", "set an alternate installation root")
 	cmd.Flags().Bool("sysroot", false, "operate on a mounted guest system (root-only)")
 	cmd.Flags().BoolP("unneeded", "u", false, "remove unneeded packages")
 	cmd.Flags().BoolP("verbose", "v", false, "be verbose")
 
 	carapace.Gen(cmd).FlagCompletion(carapace.ActionMap{
-		"arch":    carapace.ActionValues("i686", "x86_64"),
-		"color":   carapace.ActionValues("auto", "never", "always").StyleF(style.ForKeyword),
-		"config":  carapace.ActionFiles(),
-		"dbpath":  carapace.ActionFiles(),
-		"gpgdir":  carapace.ActionDirectories(),
-		"hookdir": carapace.ActionDirectories(),
-		"root":    carapace.ActionDirectories(),
+		"arch":     carapace.ActionValues("i686", "x86_64"),
+		"cachedir": carapace.ActionDirectories(),
+		"color":    carapace.ActionValues("auto", "never", "always").StyleF(style.ForKeyword),
+		"config":   carapace.ActionFiles(),
+		"dbpath":   carapace.ActionFiles(),
+		"gpgdir":   carapace.ActionDirectories(),
+		"hookdir":  carapace.ActionDirectories(),
+		"logfile":  carapace.ActionFiles(),
+		"root":     carapace.ActionDirectories(),
 	})
 
 	carapace.Gen(cmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return pacman.ActionPackages(pacman.PackageOption{Explicit: true}).Invoke(c).Filter(c.Args).ToA()
+			return pacman.ActionPackages().Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }