Merge pull request #108 from TIBCOSoftware/update-to-versioncommand

Update to version command
TIBCOSoftware · Jun 1, 2018 · a427716 · a427716
2 parents 80636ce + d6594de
commit a427716
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/app/version.go b/app/version.go
@@ -69,7 +69,15 @@ func (c *cmdVersion) AddFlags(fs *flag.FlagSet) {
 func (c *cmdVersion) Exec(args []string) error {
 
 	cmd := exec.Command("git", "describe", "--tags")
-	cmd.Dir = filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "TIBCOSoftware", "flogo-cli")
+	gopath, set := os.LookupEnv("GOPATH")
+	if !set {
+		out, err := exec.Command("go", "env", "GOPATH").Output()
+		if err != nil {
+			log.Fatal(err)
+		}
+		gopath = strings.TrimSuffix(string(out), "\n")
+	}
+	cmd.Dir = filepath.Join(gopath, "src", "github.com", "TIBCOSoftware", "flogo-cli")
 	cmd.Env = append(os.Environ())
 
 	out, err := cmd.Output()