core,tun2socks: prefer go1.24 style version

Author: ignoramous

intra/core/version.go

@@ -10,8 +10,11 @@ package core
 import (
 	"fmt"
 	"runtime"
+	"runtime/debug"
 )
 
+var buildinfo, _ = debug.ReadBuildInfo()
+
 var (
 	// Commit set at link time by git rev-parse --short HEAD
 	Commit string
@@ -20,5 +23,19 @@ var (
 )
 
 func Version() string {
-	return fmt.Sprintf("v%s-%s (%s/%s@%s)", Date, Commit, runtime.GOOS, runtime.GOARCH, runtime.Version())
+	return fmt.Sprintf("%s (%s/%s@%s)", stamp(), runtime.GOOS, runtime.GOARCH, runtime.Version())
+}
+
+func stamp() string {
+	if buildinfo != nil {
+		return buildinfo.Main.Path + "@v" + buildinfo.Main.Version
+	}
+	return Date + "-" + Commit
+}
+
+func BuildInfo() string {
+	if buildinfo == nil {
+		return "unknown"
+	}
+	return buildinfo.String()
 }

intra/tun2socks.go

@@ -38,8 +38,6 @@ import (
 	"github.com/celzero/firestack/intra/log"
 )
 
-var buildinfo, _ = debug.ReadBuildInfo()
-
 // pkg.go.dev/runtime#hdr-Environment_Variables
 type traceout string
 
@@ -151,12 +149,11 @@ func Transparency(eim, eif bool) {
 }
 
 // Build returns the build information.
-func Build(full bool) string {
-	v := "unknown"
+func Build(full bool) (v string) {
 	if !full {
 		v = core.Version()
-	} else if buildinfo != nil {
-		v = buildinfo.String()
+	} else {
+		v = core.BuildInfo()
 	}
 	log.V("tun: build version %s", v)
 	return v