Skip to content

Commit

Permalink
Conform ldflag names to those that goreleaser uses
Browse files Browse the repository at this point in the history
  • Loading branch information
senorprogrammer committed May 17, 2018
1 parent 4c5edad commit 430ade3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
2 changes: 0 additions & 2 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,3 @@ builds:
- linux
goarch:
- amd64
ldflags:
- -X main.builtat=$(shell date +%FT%T%z)"
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
12 changes: 6 additions & 6 deletions system/widget.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand All @@ -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",
Expand All @@ -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 {
Expand Down
5 changes: 3 additions & 2 deletions wtf.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ var FocusTracker wtf.FocusTracker
var Widgets []wtf.Wtfable

var (
builtat = "dev"
commit = "dev"
date = "dev"
version = "dev"
)

Expand Down Expand Up @@ -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),
Expand Down

0 comments on commit 430ade3

Please sign in to comment.