From 430ade3fe5f4db76e657eec0201af7a63d6a0798 Mon Sep 17 00:00:00 2001
From: Chris Cummer <chriscummer@me.com>
Date: Thu, 17 May 2018 14:23:41 -0700
Subject: [PATCH] Conform ldflag names to those that goreleaser uses

---
 .goreleaser.yml  |  2 --
 Makefile         |  2 +-
 system/widget.go | 12 ++++++------
 wtf.go           |  5 +++--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 6b75af061..fa4af340e 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -9,5 +9,3 @@ builds:
       - linux
     goarch:
       - amd64
-    ldflags:
-      - -X main.builtat=$(shell date +%FT%T%z)"
diff --git a/Makefile b/Makefile
index eb7659d23..0cefa79a9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,4 +2,4 @@ BRANCH := `git rev-parse --abbrev-ref HEAD`
 
 install:
 	which wtf | xargs rm
-	go install -ldflags="-X main.version=$(shell git describe --always --abbrev=6)_$(BRANCH) -X main.builtat=$(shell date +%FT%T%z)"
+	go install -ldflags="-X main.version=$(shell git describe --always --abbrev=6)_$(BRANCH) -X main.date=$(shell date +%FT%T%z)"
diff --git a/system/widget.go b/system/widget.go
index 6024fc2d2..76833ebed 100644
--- a/system/widget.go
+++ b/system/widget.go
@@ -15,15 +15,15 @@ type Widget struct {
 	wtf.TextWidget
 
 	systemInfo *SystemInfo
-	BuiltAt    string
+	Date       string
 	Version    string
 }
 
-func NewWidget(builtAt, version string) *Widget {
+func NewWidget(date, version string) *Widget {
 	widget := Widget{
 		TextWidget: wtf.NewTextWidget(" Build ", "system", false),
 
-		BuiltAt: builtAt,
+		Date:    date,
 		Version: version,
 	}
 
@@ -43,7 +43,7 @@ func (widget *Widget) Refresh() {
 		widget.View,
 		"%8s: %s\n%8s: %s\n\n%8s: %s\n%8s: %s",
 		"Built",
-		widget.prettyBuiltAt(),
+		widget.prettyDate(),
 		"Vers",
 		widget.Version,
 		"OS",
@@ -55,8 +55,8 @@ func (widget *Widget) Refresh() {
 	widget.RefreshedAt = time.Now()
 }
 
-func (widget *Widget) prettyBuiltAt() string {
-	str, err := time.Parse(wtf.TimestampFormat, widget.BuiltAt)
+func (widget *Widget) prettyDate() string {
+	str, err := time.Parse(wtf.TimestampFormat, widget.Date)
 	if err != nil {
 		return err.Error()
 	} else {
diff --git a/wtf.go b/wtf.go
index 8d8441f5e..00ef3e6a6 100644
--- a/wtf.go
+++ b/wtf.go
@@ -109,7 +109,8 @@ var FocusTracker wtf.FocusTracker
 var Widgets []wtf.Wtfable
 
 var (
-	builtat = "dev"
+	commit  = "dev"
+	date    = "dev"
 	version = "dev"
 )
 
@@ -175,7 +176,7 @@ func main() {
 		opsgenie.NewWidget(),
 		security.NewWidget(),
 		status.NewWidget(),
-		system.NewWidget(builtat, version),
+		system.NewWidget(date, version),
 		textfile.NewWidget(app, pages),
 		todo.NewWidget(app, pages),
 		weather.NewWidget(app, pages),