From 5cd8ba242157d552d3104ce09d06c5418c52eab4 Mon Sep 17 00:00:00 2001 From: Ayke van Laethem Date: Thu, 28 Sep 2023 15:42:50 +0200 Subject: all: refactor goenv.Version to add the git sha1 if needed Previously all (except one!) usage of goenv.Version manually added the git sha1 hash, leading to duplicate code. I've moved this to do it all in one place, to avoid this duplication. --- main.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 0a8a652b7..ff89fbee5 100644 --- a/main.go +++ b/main.go @@ -1212,15 +1212,10 @@ func getBMPPorts() (gdbPort, uartPort string, err error) { } func usage(command string) { - version := goenv.Version - if strings.HasSuffix(version, "-dev") && goenv.GitSha1 != "" { - version += "-" + goenv.GitSha1 - } - switch command { default: fmt.Fprintln(os.Stderr, "TinyGo is a Go compiler for small places.") - fmt.Fprintln(os.Stderr, "version:", version) + fmt.Fprintln(os.Stderr, "version:", goenv.Version()) fmt.Fprintf(os.Stderr, "usage: %s [arguments]\n", os.Args[0]) fmt.Fprintln(os.Stderr, "\ncommands:") fmt.Fprintln(os.Stderr, " build: compile packages and dependencies") @@ -1874,11 +1869,7 @@ func main() { if s, err := goenv.GorootVersionString(); err == nil { goversion = s } - version := goenv.Version - if strings.HasSuffix(goenv.Version, "-dev") && goenv.GitSha1 != "" { - version += "-" + goenv.GitSha1 - } - fmt.Printf("tinygo version %s %s/%s (using go version %s and LLVM version %s)\n", version, runtime.GOOS, runtime.GOARCH, goversion, llvm.Version) + fmt.Printf("tinygo version %s %s/%s (using go version %s and LLVM version %s)\n", goenv.Version(), runtime.GOOS, runtime.GOARCH, goversion, llvm.Version) case "env": if flag.NArg() == 0 { // Show all environment variables. -- cgit v1.2.3