From 206a602e7737b288a2c052c4e1b6a1419e8c3657 Mon Sep 17 00:00:00 2001 From: James Lawrence Date: Sat, 4 Sep 2021 15:29:58 -0400 Subject: [PATCH] use terminal environment variable if present --- main.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index 1011894..0b9cfc4 100644 --- a/main.go +++ b/main.go @@ -99,6 +99,14 @@ var ( ignore string ) +func defaultStringIfBlank(s, fallback string) string { + s = strings.TrimSpace(s) + if s == "" { + return fallback + } + return s +} + // Flags var cssFileName = flag.String("s", "drawer.css", "Styling: css file name") var targetOutput = flag.String("o", "", "name of the Output to display the drawer on (sway only)") @@ -110,7 +118,7 @@ var columnsNumber = flag.Uint("c", 6, "number of Columns") var itemSpacing = flag.Uint("spacing", 20, "icon spacing") var lang = flag.String("lang", "", "force lang, e.g. \"en\", \"pl\"") var fileManager = flag.String("fm", "thunar", "File Manager") -var term = flag.String("term", "alacritty", "Terminal emulator") +var term = flag.String("term", defaultStringIfBlank(os.Getenv("TERM"), "alacritty"), "Terminal emulator") var nameLimit = flag.Int("fslen", 80, "File Search name length Limit") var noCats = flag.Bool("nocats", false, "Disable filtering by category") var noFS = flag.Bool("nofs", false, "Disable file search")