Move version extraction to init

5nord · 5nord · commit 0ed79a96b40e · 2024-11-11T11:30:34.000+01:00
diff --git a/main.go b/main.go
@@ -107,7 +107,7 @@ var (
 	testsFiles     []string
 	chdir          string
 
-	version = "dev"
+	version = "devel"
 	commit  = "none"
 	date    = "unknown"
 
diff --git a/version.go b/version.go
@@ -19,10 +19,8 @@ var (
 
 func init() {
 	RootCommand.AddCommand(VersionCommand)
-}
 
-func versionInfo(cmd *cobra.Command, args []string) {
-	if version == "dev" {
+	if version == "devel" {
 		info, ok := debug.ReadBuildInfo()
 		if ok && strings.HasPrefix(info.Main.Version, "v") {
 			version = info.Main.Version
@@ -41,5 +39,8 @@ func versionInfo(cmd *cobra.Command, args []string) {
 		}
 	}
 
+}
+
+func versionInfo(cmd *cobra.Command, args []string) {
 	fmt.Printf("ntt %v, commit %s, built at %s\n", version, commit, date)
 }

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,8 @@ var (`
`19`	`19`
`20`	`20`	`func init() {`
`21`	`21`	`RootCommand.AddCommand(VersionCommand)`
`22`		`-}`
`23`	`22`
`24`		`-func versionInfo(cmd *cobra.Command, args []string) {`
`25`		`- if version == "dev" {`
	`23`	`+ if version == "devel" {`
`26`	`24`	`info, ok := debug.ReadBuildInfo()`
`27`	`25`	`if ok && strings.HasPrefix(info.Main.Version, "v") {`
`28`	`26`	`version = info.Main.Version`
`@@ -41,5 +39,8 @@ func versionInfo(cmd *cobra.Command, args []string) {`
`41`	`39`	`}`
`42`	`40`	`}`
`43`	`41`
	`42`	`+}`
	`43`	`+`
	`44`	`+func versionInfo(cmd *cobra.Command, args []string) {`
`44`	`45`	`fmt.Printf("ntt %v, commit %s, built at %s\n", version, commit, date)`
`45`	`46`	`}`