Merge pull request #24 from nwg-piotr/fix_nodisplay

Fix nodisplay, fix running in terminal
nwg-piotr · Sep 7, 2021 · 6ca8e6a · 6ca8e6a
2 parents 1be8e43 + f12be46
commit 6ca8e6a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -20,4 +20,5 @@ uninstall:
 	rm /usr/bin/nwg-drawer
 
 run:
-	go run *.go
+	go build -o bin/nwg-drawer *.go
+	bin/nwg-drawer
diff --git a/bin/nwg-drawer b/bin/nwg-drawer
diff --git a/main.go b/main.go
@@ -101,7 +101,9 @@ var (
 
 func defaultStringIfBlank(s, fallback string) string {
 	s = strings.TrimSpace(s)
-	if s == "" {
+	// os.Getenv("TERM") returns "linux" instead of empty string, if program has been started
+	// from a key binding defined in the config file. See #23.
+	if s == "" || s == "linux" {
 		return fallback
 	}
 	return s

diff --git a/tools.go b/tools.go
@@ -366,7 +366,8 @@ func parseDesktopFiles(desktopFiles []string) string {
 
 		if entry.NoDisplay {
 			hidden++
-			continue
+			// We still need hidden entries, so `continue` is disallowed here
+			// Fixes introduced in #19
 		}
 
 		id2entry[entry.DesktopID] = entry