Merge pull request #26 from prplecake/ua-version

Author: prplecake

.github/workflows/go.yml

@@ -28,7 +28,7 @@ jobs:
           ${{ runner.os }}-go-
 
     - name: Build
-      run: go build -v ./...
+      run: make build
 
     #- name: Test
     #  run: go test -v ./...

.github/workflows/release.yml

@@ -23,4 +23,6 @@ jobs:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         goos: ${{ matrix.goos }}
         goarch: ${{ matrix.goarch }}
+        build_command: "make"
+        build_flags: "build"
         extra_files: LICENSE README.md gof.example.yaml

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,15 @@
+VERSION := $(shell git describe --tags --abbrev=0)
+BUILDTIME := $(shell date -u '+%Y-%m-%dT%H:%M:%SZ')
+
+GOLDFLAGS += -X main.Version=$(VERSION)
+GOLDFLAGS += -X main.Buildtime=$(BUILDTIME)
+GOFLAGS = -ldflags "$(GOLDFLAGS)"
+
+run: build
+	./gof
+
+dry-run: build
+	./gof -dry-run
+
+build:
+	go build -o gof $(GOFLAGS) .

Makefile

@@ -1,18 +1,17 @@
 package main
 
 import (
+	"fmt"
 	"log"
 	"os"
 	"time"
 
 	"gopkg.in/yaml.v2"
 )
 
-const (
-	HttpUserAgent = "gof"
-)
-
 var (
+	Version    string
+	Buildtime  string
 	configFile string
 )
 
@@ -28,6 +27,13 @@ type config struct {
 	Accounts    []account
 	LastUpdated time.Time
 	HttpConfig  httpConfig
+	Meta        meta
+}
+
+type meta struct {
+	Name      string
+	Version   string
+	Buildtime string
 }
 
 type account struct {
@@ -56,7 +62,11 @@ func readConfig(fileName string) *config {
 	if debug {
 		log.Printf("Config:\n\n%v", config)
 	}
-	config.HttpConfig.UserAgent = HttpUserAgent
+	config.Meta.Name = "gof"
+	config.Meta.Version = Version
+	config.Meta.Buildtime = Buildtime
+	config.HttpConfig.UserAgent = fmt.Sprintf("%s/%s",
+		config.Meta.Name, config.Meta.Version)
 	return config
 }
 

config.go

@@ -36,6 +36,8 @@ func main() {
 
 	log.Println("gof starting up...")
 	conf = readConfig(configFile)
+	log.Printf("Version: %s\n", conf.Meta.Version)
+	log.Printf("Build time: %s\n", conf.Meta.Buildtime)
 
 	var tpls = make(map[string]*template.Template)
 	var formats = make(map[string]string)