diff --git a/dotool.go b/dotool.go index db4abf3..22c206b 100644 --- a/dotool.go +++ b/dotool.go @@ -232,43 +232,43 @@ func main() { keyboardName := []byte("dotool keyboard") { - optset := opt.NewOptionSet() + o := opt.NewOptSet() - optset.FlagFunc("h", func() error { + o.FlagFunc("h", func() error { usage() os.Exit(0) panic("unreachable") }) - optset.Alias("h", "help") + o.Alias("h", "help") - optset.Func("keyboard-name", func(s string) error { + o.Func("keyboard-name", func(s string) error { keyboardName = []byte(s) return nil }) - optset.FlagFunc("list-keys", func() error { + o.FlagFunc("list-keys", func() error { listKeys(keymap, LinuxKeys) os.Exit(0) panic("unreachable") }) - optset.FlagFunc("list-x-keys", func() error { + o.FlagFunc("list-x-keys", func() error { listKeys(keymap, XKeys) os.Exit(0) panic("unreachable") }) - optset.FlagFunc("version", func() error { + o.FlagFunc("version", func() error { fmt.Println(Version) os.Exit(0) panic("unreachable") }) - err := optset.Parse(true, os.Args[1:]) + err := o.Parse(true, os.Args[1:]) if err != nil { fatal(err.Error()) } - if len(optset.Args()) > 0 { + if len(o.Args()) > 0 { fatal("there should be no arguments, commands are read from stdin") } } diff --git a/go.mod b/go.mod index 20e37b7..dc00215 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module git.sr.ht/~geb/dotool go 1.19 require ( - git.sr.ht/~geb/opt v0.0.0-20221207200434-dad26d091d71 - github.com/bendahl/uinput v1.6.0 + git.sr.ht/~geb/opt v0.0.0-20230911153257-e72225a1933c + github.com/bendahl/uinput v1.6.2 ) diff --git a/go.sum b/go.sum index 8ffbbac..03906c9 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,4 @@ -git.sr.ht/~geb/opt v0.0.0-20221207200434-dad26d091d71 h1:jh3Ite7R1ZvdLt6j52e4njO2SS/z5dWOLXllw7inalc= -git.sr.ht/~geb/opt v0.0.0-20221207200434-dad26d091d71/go.mod h1:S6h1g8P7DyG7i7YIHZ5IpYbC6lzZB9DYIEl8PyXOmsg= -github.com/bendahl/uinput v1.6.0 h1:fM6r3OSC17rHh758mizKjSBuqi+XinhiGd4N3pWvZiI= -github.com/bendahl/uinput v1.6.0/go.mod h1:Np7w3DINc9wB83p12fTAM3DPPhFnAKP0WTXRqCQJ6Z8= +git.sr.ht/~geb/opt v0.0.0-20230911153257-e72225a1933c h1:gIC1gnCgoasPHks1x6MB+bgDmIWMxKc5HIJPJrsV5Ck= +git.sr.ht/~geb/opt v0.0.0-20230911153257-e72225a1933c/go.mod h1:S6h1g8P7DyG7i7YIHZ5IpYbC6lzZB9DYIEl8PyXOmsg= +github.com/bendahl/uinput v1.6.2 h1:tIz52QyKDx1i1nObUkts3AZa/bULfLhPA5a+xKGlRPI= +github.com/bendahl/uinput v1.6.2/go.mod h1:Np7w3DINc9wB83p12fTAM3DPPhFnAKP0WTXRqCQJ6Z8=