fix: get proper version

This commit is contained in:
Antoine Aflalo
2024-08-27 20:22:22 -04:00
parent c8fe726a96
commit f451b660be
4 changed files with 12 additions and 22 deletions

View File

@@ -36,7 +36,7 @@ builds:
# trims path
- -trimpath
ldflags:
- -s -w -X meta.Version={{.Version}} -X meta.Commit={{.Commit}} -X meta.Date={{ .CommitDate }}
- -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X meta.date={{ .CommitDate }}
env:
- CGO_ENABLED=0
# config the checksum filename

View File

@@ -14,6 +14,10 @@ var rootCmd = &cobra.Command{
Short: "Convert CBZ files using a specified converter",
}
func SetVersionInfo(version, commit, date string) {
rootCmd.Version = fmt.Sprintf("%s (Built on %s from Git SHA %s)", version, date, commit)
}
func getPath() string {
return filepath.Join(map[string]string{
"windows": filepath.Join(os.Getenv("APPDATA")),

View File

@@ -1,21 +0,0 @@
package cmd
import (
"fmt"
"github.com/belphemur/CBZOptimizer/meta"
"github.com/spf13/cobra"
)
func init() {
command := &cobra.Command{
Use: "version",
Short: "Print the version of the application",
Long: "Print the version of the application",
Run: VersionCommand,
}
AddCommand(command)
}
func VersionCommand(_ *cobra.Command, _ []string) {
fmt.Printf("CBZOptimizer %s [%s] built [%s]\n", meta.Version, meta.Commit, meta.Date)
}

View File

@@ -4,6 +4,13 @@ import (
"github.com/belphemur/CBZOptimizer/cmd"
)
var (
version = "dev"
commit = "none"
date = "unknown"
)
func main() {
cmd.SetVersionInfo(version, commit, date)
cmd.Execute()
}