mirror of
https://github.com/taigrr/wtf
synced 2025-01-18 04:03:14 -08:00
Conform ldflag names to those that goreleaser uses
This commit is contained in:
parent
4c5edad61e
commit
430ade3fe5
@ -9,5 +9,3 @@ builds:
|
|||||||
- linux
|
- linux
|
||||||
goarch:
|
goarch:
|
||||||
- amd64
|
- amd64
|
||||||
ldflags:
|
|
||||||
- -X main.builtat=$(shell date +%FT%T%z)"
|
|
||||||
|
2
Makefile
2
Makefile
@ -2,4 +2,4 @@ BRANCH := `git rev-parse --abbrev-ref HEAD`
|
|||||||
|
|
||||||
install:
|
install:
|
||||||
which wtf | xargs rm
|
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)"
|
||||||
|
@ -15,15 +15,15 @@ type Widget struct {
|
|||||||
wtf.TextWidget
|
wtf.TextWidget
|
||||||
|
|
||||||
systemInfo *SystemInfo
|
systemInfo *SystemInfo
|
||||||
BuiltAt string
|
Date string
|
||||||
Version string
|
Version string
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewWidget(builtAt, version string) *Widget {
|
func NewWidget(date, version string) *Widget {
|
||||||
widget := Widget{
|
widget := Widget{
|
||||||
TextWidget: wtf.NewTextWidget(" Build ", "system", false),
|
TextWidget: wtf.NewTextWidget(" Build ", "system", false),
|
||||||
|
|
||||||
BuiltAt: builtAt,
|
Date: date,
|
||||||
Version: version,
|
Version: version,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -43,7 +43,7 @@ func (widget *Widget) Refresh() {
|
|||||||
widget.View,
|
widget.View,
|
||||||
"%8s: %s\n%8s: %s\n\n%8s: %s\n%8s: %s",
|
"%8s: %s\n%8s: %s\n\n%8s: %s\n%8s: %s",
|
||||||
"Built",
|
"Built",
|
||||||
widget.prettyBuiltAt(),
|
widget.prettyDate(),
|
||||||
"Vers",
|
"Vers",
|
||||||
widget.Version,
|
widget.Version,
|
||||||
"OS",
|
"OS",
|
||||||
@ -55,8 +55,8 @@ func (widget *Widget) Refresh() {
|
|||||||
widget.RefreshedAt = time.Now()
|
widget.RefreshedAt = time.Now()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (widget *Widget) prettyBuiltAt() string {
|
func (widget *Widget) prettyDate() string {
|
||||||
str, err := time.Parse(wtf.TimestampFormat, widget.BuiltAt)
|
str, err := time.Parse(wtf.TimestampFormat, widget.Date)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err.Error()
|
return err.Error()
|
||||||
} else {
|
} else {
|
||||||
|
5
wtf.go
5
wtf.go
@ -109,7 +109,8 @@ var FocusTracker wtf.FocusTracker
|
|||||||
var Widgets []wtf.Wtfable
|
var Widgets []wtf.Wtfable
|
||||||
|
|
||||||
var (
|
var (
|
||||||
builtat = "dev"
|
commit = "dev"
|
||||||
|
date = "dev"
|
||||||
version = "dev"
|
version = "dev"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -175,7 +176,7 @@ func main() {
|
|||||||
opsgenie.NewWidget(),
|
opsgenie.NewWidget(),
|
||||||
security.NewWidget(),
|
security.NewWidget(),
|
||||||
status.NewWidget(),
|
status.NewWidget(),
|
||||||
system.NewWidget(builtat, version),
|
system.NewWidget(date, version),
|
||||||
textfile.NewWidget(app, pages),
|
textfile.NewWidget(app, pages),
|
||||||
todo.NewWidget(app, pages),
|
todo.NewWidget(app, pages),
|
||||||
weather.NewWidget(app, pages),
|
weather.NewWidget(app, pages),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user