waybar: update 2021-02-11T12:46:11Z

1 files changed, 13 insertions, 8 deletions

diff --git a/.config/waybar/modules/redshift.go b/.config/waybar/modules/gammastep.go
index b336748..c855e1b 100644
--- a/.config/waybar/modules/redshift.go
+++ b/.config/waybar/modules/gammastep.go
@@ -1,10 +1,10 @@
 // usage:
-// go build -o waybar-redshift redshift.go
+// go build -o waybar-gammastep gammastep.go
 package main
 
 import (
 	"encoding/json"
-	"fmt"
+	"log"
 	"os"
 	"os/exec"
 	"os/signal"
@@ -27,6 +27,7 @@ func main() {
 		uintptr(PR_SET_PDEATHSIG),
 		uintptr(SIGTERM),
 		0, 0, 0, 0); e != 0 {
+		log.Printf("error: %v", e)
 		os.Exit(1)
 	}
 	// if err := Prctl(PR_SET_PDEATHSIG,
@@ -51,7 +52,7 @@ func main() {
 				lookup()
 			}
 		case <-cancel:
-			fmt.Fprintf(os.Stderr, "%v exiting\n", os.Args[0])
+			log.Printf("%v exiting\n", os.Args[0])
 			os.Exit(0)
 		}
 	}
@@ -61,29 +62,33 @@ func printJson(state, tooltip string) {
 	_ = json.NewEncoder(os.Stdout).Encode(map[string]interface{}{
 		"class":   state,
 		"alt":     state,
-		"tooltip": "redshift: " + tooltip,
+		"tooltip": "gammastep: " + tooltip,
 		"text":    state,
 	})
 }
 
 func lookup() {
-	b, err := exec.Command("redshift", "-p").Output()
+	b, err := exec.Command("gammastep", "-p").CombinedOutput()
 	if err != nil {
+		log.Printf("error: %v", err)
 		return
 	}
-	fds := strings.Fields(string(b))
+	var period string
+	var fds = strings.Fields(string(b))
 	for idx, f := range fds {
 		if f == "Period:" {
-			fds = fds[idx+1:]
+			period = fds[idx+1]
 			break
 		}
 	}
-	switch fds[0] {
+	switch period {
 	case "Night":
 		printJson("night", "night")
 	case "Transition":
 		printJson("night", "transition")
 	case "Daytime":
 		printJson("day", "day")
+	default:
+		printJson("unknown", "unknown")
 	}
 }