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

sort : more consistent use of common libs

Browse source
This commit is contained in:
bth 2026-01-20 19:42:00 -08:00
commit b69f3aabd0
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sort/sort.go
View file

@ -69,7 +69,7 @@ func fileListSplit(f string) []string {
dat, err := os.ReadFile(f) dat, err := os.ReadFile(f)
if err != nil { if err != nil {
// if this fails all is lost. just exit. // if this fails all is lost. just exit.
log.Fatal(fmt.Errorf("um sort: error opening file: %s\n%w", f, err)) log.Fatalf("um %s: error opening file: %s\n%s", cmd, f, err)
} }
return strings.Split(string(dat), pipe.Newline) return strings.Split(string(dat), pipe.Newline)
} }
@ -102,9 +102,9 @@ func sort(sslice []string, kmap map[string]int) string {
return strings.Join(oslice, pipe.Newline) + pipe.Newline return strings.Join(oslice, pipe.Newline) + pipe.Newline
} }
func Write(file string, content string) { func write(file string, content string) {
if err := os.WriteFile(file, []byte(content), 0664); err != nil { if err := os.WriteFile(file, []byte(content), 0664); err != nil {
log.Fatal(err) log.Fatalf("um %s: error writing file: %s\n%s", cmd, file, err)
} }
} }
@ -115,8 +115,8 @@ func Sort(args []string) {
kslice := fileListSplit(opts.Key.Val) kslice := fileListSplit(opts.Key.Val)
kmap := kMap(kslice) kmap := kMap(kslice)
out := sort(sslice, kmap) out := sort(sslice, kmap)
if opts.Write.Val { if opts.Write.IsSet() {
Write(opts.Key.Val, out) write(opts.Key.Val, out)
} else { } else {
// to stdout // to stdout
fmt.Print(out) fmt.Print(out)