Skip to content

Commit dd57415

Browse files
rsteubersteube
authored
Merge pull request #2775 from Saurabh825/coreutils
Add/update completers for GNU coreutils 9.7
2 parents 72a30b7 + 82140da commit dd57415

File tree

15 files changed

+248
-21
lines changed

15 files changed

+248
-21
lines changed

‎completers/chgrp_completer/cmd/root.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ import (
99
var rootCmd = &cobra.Command{
1010
Use: "chgrp",
1111
Short: "change group ownership",
12-
Long: "https://en.wikipedia.org/wiki/Chgrp",
12+
Long: "https://man7.org/linux/man-pages/man1/chgrp.1.html",
1313
Run: func(cmd *cobra.Command, args []string) {},
1414
}
1515

1616
func Execute() error {
1717
return rootCmd.Execute()
1818
}
19+
1920
func init() {
2021
carapace.Gen(rootCmd).Standalone()
2122

@@ -24,6 +25,7 @@ func init() {
2425
rootCmd.Flags().BoolS("P", "P", false, "do not traverse any symbolic links (default)")
2526
rootCmd.Flags().BoolP("changes", "c", false, "like verbose but report only when a change is made")
2627
rootCmd.Flags().Bool("dereference", false, "affect the referent of each symbolic link (this is the default), rather than the symbolic link itself")
28+
rootCmd.Flags().String("from", "", "change the ownership of each file only if its current owner and/or group match those specified here")
2729
rootCmd.Flags().Bool("help", false, "display this help and exit")
2830
rootCmd.Flags().BoolP("no-dereference", "h", false, "affect symbolic links instead of any referenced file (useful only on systems that can change the ownership of a symlink)")
2931
rootCmd.Flags().Bool("no-preserve-root", false, "do not treat '/' specially (the default)")
@@ -36,6 +38,7 @@ func init() {
3638
rootCmd.Flags().Bool("version", false, "output version information and exit")
3739

3840
carapace.Gen(rootCmd).FlagCompletion(carapace.ActionMap{
41+
"from": os.ActionUserGroup(),
3942
"reference": carapace.ActionFiles(),
4043
})
4144

‎completers/chmod_completer/cmd/root.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,24 @@ import (
99
var rootCmd = &cobra.Command{
1010
Use: "chmod",
1111
Short: "change file mode bits",
12-
Long: "https://en.wikipedia.org/wiki/Chmod",
12+
Long: "https://www.man7.org/linux/man-pages/man1/chmod.1.html",
1313
Run: func(cmd *cobra.Command, args []string) {},
1414
}
1515

1616
func Execute() error {
1717
return rootCmd.Execute()
1818
}
19+
1920
func init() {
2021
carapace.Gen(rootCmd).Standalone()
2122

23+
rootCmd.Flags().BoolS("H", "H", false, "if a command line argument is a symbolic link to a directory, traverse it")
24+
rootCmd.Flags().BoolS("L", "L", false, "traverse every symbolic link to a directory encountered")
25+
rootCmd.Flags().BoolS("P", "P", false, "do not traverse any symbolic links")
2226
rootCmd.Flags().BoolP("changes", "c", false, "like verbose but report only when a change is made")
27+
rootCmd.Flags().Bool("dereference", false, "affect the referent of each symbolic link, rather than the symbolic link itself")
2328
rootCmd.Flags().Bool("help", false, "display this help and exit")
29+
rootCmd.Flags().BoolP("no-dereference", "h", false, "affect each symbolic link, rather than the referent")
2430
rootCmd.Flags().Bool("no-preserve-root", false, "do not treat '/' specially (the default)")
2531
rootCmd.Flags().Bool("preserve-root", false, "fail to operate recursively on '/'")
2632
rootCmd.Flags().Bool("quiet", false, "suppress most error messages")

‎completers/chown_completer/cmd/root.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ import (
99
var rootCmd = &cobra.Command{
1010
Use: "chown",
1111
Short: "change file owner and group",
12-
Long: "https://en.wikipedia.org/wiki/Chown",
12+
Long: "https://man7.org/linux/man-pages/man1/chown.1.html",
1313
Run: func(cmd *cobra.Command, args []string) {},
1414
}
1515

1616
func Execute() error {
1717
return rootCmd.Execute()
1818
}
19+
1920
func init() {
2021
carapace.Gen(rootCmd).Standalone()
2122

@@ -24,11 +25,12 @@ func init() {
2425
rootCmd.Flags().BoolS("P", "P", false, "do not traverse any symbolic links (default)")
2526
rootCmd.Flags().BoolP("changes", "c", false, "like verbose but report only when a change is made")
2627
rootCmd.Flags().Bool("dereference", false, "affect the referent of each symbolic link")
27-
rootCmd.Flags().String("from", "", "change the owner and/or group of each file only if its current owner and/or group match those specified here.")
28+
rootCmd.Flags().String("from", "", "change the ownership of each file only if its current owner and/or group match those specified here")
2829
rootCmd.Flags().Bool("help", false, "display this help and exit")
2930
rootCmd.Flags().BoolP("no-dereference", "h", false, "affect symbolic links instead of any referenced file")
3031
rootCmd.Flags().Bool("no-preserve-root", false, "do not treat '/' specially (the default)")
3132
rootCmd.Flags().Bool("preserve-root", false, "fail to operate recursively on '/'")
33+
rootCmd.Flags().Bool("quiet", false, "suppress most error messages")
3234
rootCmd.Flags().BoolP("recursive", "R", false, "operate on files and directories recursively")
3335
rootCmd.Flags().String("reference", "", "use RFILE's owner and group rather than specifying OWNER:GROUP values")
3436
rootCmd.Flags().StringP("silent", "f", "", "suppress most error messages")

‎completers/cksum_completer/cmd/root.go‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,51 @@ import (
77

88
var rootCmd = &cobra.Command{
99
Use: "cksum",
10-
Short: "checksum and count the bytes in a file",
11-
Long: "https://en.wikipedia.org/wiki/Cksum",
10+
Short: "compute and verify file checksums",
11+
Long: "https://www.man7.org/linux/man-pages/man1/cksum.1.html",
1212
Run: func(cmd *cobra.Command, args []string) {},
1313
}
1414

1515
func Execute() error {
1616
return rootCmd.Execute()
1717
}
18+
1819
func init() {
1920
carapace.Gen(rootCmd).Standalone()
2021

22+
rootCmd.Flags().StringP("algorithm", "a", "", "select the digest type to use")
23+
rootCmd.Flags().Bool("base64", false, "emit base64-encoded digests, not hexadecimal")
24+
rootCmd.Flags().BoolP("check", "c", false, "read checksums from the FILEs and check them")
25+
rootCmd.Flags().Bool("debug", false, "indicate which implementation used")
2126
rootCmd.Flags().Bool("help", false, "display this help and exit")
27+
rootCmd.Flags().Bool("ignore-missing", false, "don't fail or report status for missing files")
28+
rootCmd.Flags().StringP("length", "l", "", "digest length in bits; must not exceed the max for the blake2 algorithm and must be a multiple of 8")
29+
rootCmd.Flags().Bool("quiet", false, "don't print OK for each successfully verified file")
30+
rootCmd.Flags().Bool("raw", false, "emit a raw binary digest, not hexadecimal")
31+
rootCmd.Flags().Bool("status", false, "don't output anything, status code shows success")
32+
rootCmd.Flags().Bool("strict", false, "exit non-zero for improperly formatted checksum lines")
33+
rootCmd.Flags().Bool("tag", false, "create a BSD-style checksum (the default)")
34+
rootCmd.Flags().Bool("untagged", false, "create a reversed style checksum, without digest type")
2235
rootCmd.Flags().Bool("version", false, "output version information and exit")
36+
rootCmd.Flags().BoolP("warn", "w", false, "warn about improperly formatted checksum lines")
37+
rootCmd.Flags().BoolP("zero", "z", false, "end each output line with NUL, not newline, and disable file name escaping")
38+
39+
carapace.Gen(rootCmd).FlagCompletion(carapace.ActionMap{
40+
"algorithm": carapace.ActionValuesDescribed(
41+
"sysv", "equivalent to sum -s",
42+
"bsd", "equivalent to sum -r",
43+
"crc", "equivalent to cksum",
44+
"crc32b", "only available through cksum",
45+
"md5", "equivalent to md5sum",
46+
"sha1", "equivalent to sha1sum",
47+
"sha224", "equivalent to sha224sum",
48+
"sha256", "equivalent to sha256sum",
49+
"sha384", "equivalent to sha384sum",
50+
"sha512", "equivalent to sha512sum",
51+
"blake2b", "equivalent to b2sum",
52+
"sm3", "only available through cksum",
53+
),
54+
})
2355

2456
carapace.Gen(rootCmd).PositionalAnyCompletion(carapace.ActionFiles())
2557
}

‎completers/cp_completer/cmd/root.go‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ import (
99
var rootCmd = &cobra.Command{
1010
Use: "cp",
1111
Short: "copy files and directories",
12-
Long: "https://linux.die.net/man/1/cp",
12+
Long: "https://man7.org/linux/man-pages/man1/cp.1.html",
1313
Run: func(cmd *cobra.Command, args []string) {},
1414
}
1515

1616
func Execute() error {
1717
return rootCmd.Execute()
1818
}
19+
1920
func init() {
2021
carapace.Gen(rootCmd).Standalone()
2122

@@ -29,19 +30,21 @@ func init() {
2930
rootCmd.Flags().String("context", "", "like -Z, or if CTX is specified then set the SELinux or SMACK security context to CTX")
3031
rootCmd.Flags().Bool("copy-contents", false, "copy contents of special files when recursive")
3132
rootCmd.Flags().BoolS("d", "d", false, "same as --no-dereference --preserve=links")
33+
rootCmd.Flags().Bool("debug", false, "explain how a file is copied")
3234
rootCmd.Flags().BoolP("dereference", "L", false, "always follow symbolic links in SOURCE")
3335
rootCmd.Flags().BoolP("force", "f", false, "if an existing destination file cannot be opened, remove it and try again (this option is ignored when the -n option is also used)")
3436
rootCmd.Flags().Bool("help", false, "display this help and exit")
3537
rootCmd.Flags().BoolP("interactive", "i", false, "prompt before overwrite (overrides a previous -n option)")
38+
rootCmd.Flags().Bool("keep-directory-symlink", false, "follow existing symlinks to directories")
3639
rootCmd.Flags().BoolP("link", "l", false, "hard link files instead of copying")
37-
rootCmd.Flags().BoolP("no-clobber", "n", false, "do not overwrite an existing file (overrides a previous -i option)")
40+
rootCmd.Flags().BoolP("no-clobber", "n", false, "(deprecated) silently skip existing files")
3841
rootCmd.Flags().BoolP("no-dereference", "P", false, "never follow symbolic links in SOURCE")
3942
rootCmd.Flags().StringSlice("no-preserve", []string{}, "don't preserve the specified attributes")
4043
rootCmd.Flags().BoolP("no-target-directory", "T", false, "treat DEST as a normal file")
4144
rootCmd.Flags().BoolP("one-file-system", "x", false, "stay on this file system")
4245
rootCmd.Flags().BoolS("p", "p", false, "same as --preserve=mode,ownership,timestamps")
4346
rootCmd.Flags().Bool("parents", false, "use full source file name under DIRECTORY")
44-
rootCmd.Flags().StringSlice("preserve", []string{""}, "preserve the specified attributes (default: mode,ownership,timestamps), if possible additional attributes: context, links, xattr, all")
47+
rootCmd.Flags().StringSlice("preserve", []string{}, "preserve the specified attributes")
4548
rootCmd.Flags().BoolP("recursive", "r", false, "copy directories recursively")
4649
rootCmd.Flags().String("reflink", "", "control clone/CoW copies")
4750
rootCmd.Flags().Bool("remove-destination", false, "remove each existing destination file before attempting to open it (contrast with --force)")
@@ -50,17 +53,25 @@ func init() {
5053
rootCmd.Flags().StringP("suffix", "S", "", "override the usual backup suffix")
5154
rootCmd.Flags().BoolP("symbolic-link", "s", false, "make symbolic links instead of copying")
5255
rootCmd.Flags().StringP("target-directory", "t", "", "copy all SOURCE arguments into DIRECTORY")
53-
rootCmd.Flags().BoolP("update", "u", false, "copy only when the SOURCE file is newer than the destination file or when the destination file is missing")
56+
rootCmd.Flags().BoolS("u", "u", false, "equivalent to --update[=older]")
57+
rootCmd.Flags().String("update", "", "control which existing files are updated")
5458
rootCmd.Flags().BoolP("verbose", "v", false, "explain what is being done")
5559
rootCmd.Flags().Bool("version", false, "output version information and exit")
5660

61+
rootCmd.Flag("backup").NoOptDefVal = " "
62+
rootCmd.Flag("context").NoOptDefVal = " "
63+
rootCmd.Flag("preserve").NoOptDefVal = " "
64+
rootCmd.Flag("reflink").NoOptDefVal = " "
65+
rootCmd.Flag("update").NoOptDefVal = " "
66+
5767
carapace.Gen(rootCmd).FlagCompletion(carapace.ActionMap{
58-
"backup": carapace.ActionValues("never", "nil", "none", "numbered", "off", "simple", "t"),
68+
"backup": carapace.ActionValues("never", "nil", "none", "numbered", "off", "simple", "t", "existing"),
5969
"no-preserve": carapace.ActionValues("all", "context", "links", "mode", "ownership", "timestamps", "xattr"),
6070
"preserve": carapace.ActionValues("all", "context", "links", "mode", "ownership", "timestamps", "xattr"),
61-
"reflink": carapace.ActionValues("alway", "auto").StyleF(style.ForKeyword),
71+
"reflink": carapace.ActionValues("auto", "never", "always").StyleF(style.ForKeyword),
6272
"sparse": carapace.ActionValues("auto", "never", "always").StyleF(style.ForKeyword),
6373
"target-directory": carapace.ActionDirectories(),
74+
"update": carapace.ActionValues("all", "none", "none-fail", "older"),
6475
})
6576

6677
carapace.Gen(rootCmd).PositionalAnyCompletion(

‎completers/cut_completer/cmd/root.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ import (
88
var rootCmd = &cobra.Command{
99
Use: "cut",
1010
Short: "remove sections from each line of files",
11-
Long: "https://linux.die.net/man/1/cut",
11+
Long: "https://man7.org/linux/man-pages/man1/cut.1.html",
1212
Run: func(cmd *cobra.Command, args []string) {},
1313
}
1414

1515
func Execute() error {
1616
return rootCmd.Execute()
1717
}
18+
1819
func init() {
1920
carapace.Gen(rootCmd).Standalone()
2021

21-
rootCmd.Flags().BoolS("M", "M", false, "from first to M'th (included) byte, character or field")
2222
rootCmd.Flags().StringP("bytes", "b", "", "select only these bytes")
2323
rootCmd.Flags().StringP("characters", "c", "", "select only these characters")
2424
rootCmd.Flags().Bool("complement", false, "complement the set of selected bytes, characters")

‎completers/df_completer/cmd/action/action.go‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package action
2+
3+
import (
4+
"strings"
5+
6+
"github.com/carapace-sh/carapace"
7+
)
8+
9+
func ActionColumns() carapace.Action {
10+
return carapace.ActionValuesDescribed(
11+
"source", "The source of the mount point, usually a device",
12+
"fstype", "File system type",
13+
"itotal", "Total number of inodes",
14+
"iused", "Number of used inodes",
15+
"iavail", "Number of available inodes",
16+
"ipcent", "Percentage of IUSED divided by ITOTAL",
17+
"size", "Total number of blocks",
18+
"used", "Number of used blocks",
19+
"avail", "Number of available blocks",
20+
"pcent", "Percentage of USED divided by SIZE",
21+
"file", "The file name if specified on the command line",
22+
"target", "The mount point",
23+
)
24+
}
25+
26+
func ActionFilesystemTypes() carapace.Action {
27+
return carapace.ActionExecCommand("df", "--output=fstype")(func(output []byte) carapace.Action {
28+
lines := strings.Split(string(output), "\n")
29+
return carapace.ActionValues(lines[1:]...)
30+
})
31+
}

‎completers/df_completer/cmd/root.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@ package cmd
22

33
import (
44
"github.com/carapace-sh/carapace"
5+
"github.com/carapace-sh/carapace-bin/completers/df_completer/cmd/action"
56
"github.com/spf13/cobra"
67
)
78

89
var rootCmd = &cobra.Command{
910
Use: "df",
1011
Short: "report file system disk space usage",
11-
Long: "https://linux.die.net/man/1/df",
12+
Long: "https://man7.org/linux/man-pages/man1/df.1.html",
1213
Run: func(cmd *cobra.Command, args []string) {},
1314
}
1415

1516
func Execute() error {
1617
return rootCmd.Execute()
1718
}
19+
1820
func init() {
1921
carapace.Gen(rootCmd).Standalone()
2022

@@ -37,13 +39,12 @@ func init() {
3739
rootCmd.Flags().BoolS("v", "v", false, "(ignored)")
3840
rootCmd.Flags().Bool("version", false, "output version information and exit")
3941

40-
types := []string{"adfs", "cgroup2", "efivarfs", "hfs", "pipefs", "securityfs", "ufs", "autofs", "configfs", "ext2", "hpfs", "proc", "sockfs", "vfat", "bdev", "cpuset", "ext3", "hugetlbfs", "pstore", "swap"}
42+
rootCmd.Flag("output").NoOptDefVal = " "
4143

4244
carapace.Gen(rootCmd).FlagCompletion(carapace.ActionMap{
43-
// TODO should be lists of values (comma separated)
44-
"exclude-type": carapace.ActionValues(types...),
45-
"output": carapace.ActionValues("avail", "file", "fstype", "iavail", "ipcent", "itotal", "iused", "pcent", "size", "source", "target", "used"),
46-
"type": carapace.ActionValues(types...),
45+
"exclude-type": action.ActionFilesystemTypes(),
46+
"output": action.ActionColumns().UniqueList(","),
47+
"type": action.ActionFilesystemTypes(),
4748
})
4849

4950
carapace.Gen(rootCmd).PositionalAnyCompletion(

‎completers/factor_completer/cmd/root.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,18 @@ import (
88
var rootCmd = &cobra.Command{
99
Use: "factor",
1010
Short: "factor numbers",
11-
Long: "https://linux.die.net/man/1/factor",
11+
Long: "https://man7.org/linux/man-pages/man1/factor.1.html",
1212
Run: func(cmd *cobra.Command, args []string) {},
1313
}
1414

1515
func Execute() error {
1616
return rootCmd.Execute()
1717
}
18+
1819
func init() {
1920
carapace.Gen(rootCmd).Standalone()
2021

22+
rootCmd.Flags().BoolP("exponents", "h", false, "print repeated factors in form p^e unless e is 1")
2123
rootCmd.Flags().Bool("help", false, "display this help and exit")
2224
rootCmd.Flags().Bool("version", false, "output version information and exit")
2325
}

‎completers/nproc_completer/cmd/root.go‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package cmd
2+
3+
import (
4+
"github.com/carapace-sh/carapace"
5+
"github.com/spf13/cobra"
6+
)
7+
8+
var rootCmd = &cobra.Command{
9+
Use: "nproc",
10+
Short: "print the number of processing units available",
11+
Long: "https://www.man7.org/linux/man-pages/man1/nproc.1.html",
12+
Run: func(cmd *cobra.Command, args []string) {},
13+
}
14+
15+
func Execute() error {
16+
return rootCmd.Execute()
17+
}
18+
19+
func init() {
20+
carapace.Gen(rootCmd).Standalone()
21+
22+
rootCmd.Flags().Bool("all", false, "print the number of installed processors")
23+
rootCmd.Flags().Bool("help", false, "display this help and exit")
24+
rootCmd.Flags().String("ignore", "", "if possible, exclude N processing units")
25+
rootCmd.Flags().Bool("version", false, "output version information and exit")
26+
}

0 commit comments

Comments
 (0)