bth/um
Watch
1
Fork
You've already forked um
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmd pkg for Subcommand type, use everywhere

Browse source
This commit is contained in:
bth 2026-01-20 13:30:53 -08:00
commit c434005d39
7 changed files with 52 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

7
next/last.go
View file

@ -8,10 +8,9 @@ import (
"os/exec"
"regexp"
"strings"
)
// but this stinks:
const lcmd = "last"
cmdpkg "github.com/brtholomy/um/go/cmd"
)
const (
// NOTE: the -r flag:
@ -47,7 +46,7 @@ func last() (string, error) {
func Last() {
s, err := last()
if err != nil {
log.Fatalf("um %s: %v", lcmd, err)
log.Fatalf("um %s: %v", cmdpkg.Last, err)
}
// send to stdout, not stderr as is default for log.Print:
fmt.Println(s)

15
next/next.go
View file

@ -7,10 +7,11 @@ import (
"os/exec"
"strconv"
cmdpkg "github.com/brtholomy/um/go/cmd"
"github.com/brtholomy/um/go/flags"
)
const cmd = "next"
const this = cmdpkg.Next
type options struct {
Descriptor flags.Arg
@ -35,10 +36,10 @@ func parseArgs(args []string) options {
case i == 1 && !flags.HasDashPrefix(arg):
opts.Tags.Val = arg
case arg == opts.Help.Long || arg == opts.Help.Short:
flags.Help(cmd, opts)
flags.Help(this, opts)
default:
flags.HelpInvalidArg(cmd, arg)
flags.Help(cmd, opts)
flags.HelpInvalidArg(this, arg)
flags.Help(this, opts)
}
}
return opts
@ -109,13 +110,13 @@ func Next(args []string) {
opts := parseArgs(args)
l, err := last()
if err != nil {
log.Fatalf("um %s: %v", cmd, err)
log.Fatalf("um %s: %v", this, err)
}
filename, err := next(l, opts.Descriptor.Val)
if err != nil {
log.Fatalf("um %s: %v", cmd, err)
log.Fatalf("um %s: %v", this, err)
}
if err := emacsNext(filename, opts.Tags.Val); err != nil {
log.Fatalf("um %s: %v", cmd, err)
log.Fatalf("um %s: %v", this, err)
}
}