diff --git a/generate/versioninfo.go b/generate/versioninfo.go index 624ec5f..097cce6 100644 --- a/generate/versioninfo.go +++ b/generate/versioninfo.go @@ -13,7 +13,7 @@ import ( const Homepage = "https://github.com/yi-jiayu/secure" var tmpl = template.Must(template.New("version.go").Parse(`//go:generate go run generate/versioninfo.go -// Code generated by versioninfo.go; DO NOT EDIT. +// Code generated by go generate; DO NOT EDIT. package main @@ -30,10 +30,11 @@ type VersionInfo struct { func main() { describeCmd := exec.Command("git", "describe", "--tags", "--always") - version, err := describeCmd.Output() + output, err := describeCmd.Output() if err != nil { log.Fatal(fmt.Errorf("error describing commit: %v", err)) } + version := strings.TrimSpace(string(output)) goos := os.Getenv("GOOS") if goos == "" { @@ -48,7 +49,7 @@ func main() { goVersion := runtime.Version() vi := VersionInfo{ - Version: strings.TrimSpace(string(version)), + Version: version, GOARCH: goarch, GOOS: goos, GoVersion: goVersion, diff --git a/version.go b/version.go index 179bf25..0256936 100644 --- a/version.go +++ b/version.go @@ -1,5 +1,5 @@ //go:generate go run generate/versioninfo.go -// Code generated by versioninfo.go; DO NOT EDIT. +// Code generated by go generate; DO NOT EDIT. package main