Skip to content

Commit 08bab25

Browse files
committed
Simplify retrieving default theme
1 parent a411474 commit 08bab25

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

main.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var (
2727
output = flag.String("output", "", "output fields: "+strings.Join(columnIDs(), ", "))
2828
sortBy = flag.String("sort", "mountpoint", "sort output by: "+strings.Join(columnIDs(), ", "))
2929
width = flag.Uint("width", 0, "max output width")
30-
themeOpt = flag.String("theme", "", "color themes: dark, light")
30+
themeOpt = flag.String("theme", defaultThemeName(), "color themes: dark, light")
3131

3232
inodes = flag.Bool("inodes", false, "list inode information instead of block usage")
3333
jsonOutput = flag.Bool("json", false, "output all devices in JSON format")
@@ -146,18 +146,14 @@ func parseHideFs(hideFs string) map[string]struct{} {
146146
func main() {
147147
flag.Parse()
148148

149-
if *themeOpt == "" {
150-
*themeOpt = getDefaultThemeName()
151-
}
152-
149+
// validate flags
153150
var err error
154151
theme, err = loadTheme(*themeOpt)
155152
if err != nil {
156153
fmt.Fprintln(os.Stderr, err)
157154
os.Exit(1)
158155
}
159156

160-
// validate flags
161157
columns, err := parseColumns(*output)
162158
if err != nil {
163159
fmt.Fprintln(os.Stderr, err)

themes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type Theme struct {
1616
colorCyan termenv.Color
1717
}
1818

19-
func getDefaultThemeName() string {
19+
func defaultThemeName() string {
2020
if !termenv.HasDarkBackground() {
2121
return "light"
2222
}

0 commit comments

Comments
 (0)