Merge pull request #24 from nwg-piotr/fix_nodisplay
Fix nodisplay, fix running in terminal
This commit is contained in:
3
Makefile
3
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
|
||||
|
||||
BIN
bin/nwg-drawer
BIN
bin/nwg-drawer
Binary file not shown.
4
main.go
4
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
|
||||
|
||||
Reference in New Issue
Block a user