conflict

Author: lumtis

changelog.md

@@ -6,6 +6,12 @@
 
 - Added the flag `--no-default-module` to the command `starport app` to prevent scaffolding a default module when creating a new app
 
+## `v0.16.1`
+
+### Features:
+
+- Ensure that CLI operates fine even if the installation directory (bin) of Go programs is not configured properly.
+
 ## `v0.16.0`
 
 ### Features:

starport/cmd/cmd.go

@@ -9,6 +9,7 @@ import (
 	flag "github.com/spf13/pflag"
 	"github.com/tendermint/starport/starport/pkg/clispinner"
 	"github.com/tendermint/starport/starport/pkg/events"
+	"github.com/tendermint/starport/starport/pkg/goenv"
 	"github.com/tendermint/starport/starport/services/chain"
 	"github.com/tendermint/starport/starport/services/networkbuilder"
 )
@@ -28,6 +29,9 @@ func New() *cobra.Command {
 		Short:         "A developer tool for building Cosmos SDK blockchains",
 		SilenceUsage:  true,
 		SilenceErrors: true,
+		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+			return goenv.ConfigurePath()
+		},
 	}
 	c.AddCommand(NewDocs())
 	c.AddCommand(NewApp())

starport/pkg/cmdrunner/cmdrunner.go

@@ -219,9 +219,7 @@ func (r *Runner) newCommand(step *step.Step) Executor {
 	command.Stderr = stderr
 	command.Dir = dir
 	command.Env = append(os.Environ(), step.Env...)
-	command.Env = append(command.Env, os.ExpandEnv(
-		fmt.Sprintf("PATH=$PATH:%s", goenv.GetGOBIN()),
-	))
+	command.Env = append(command.Env, fmt.Sprintf("PATH=%s", goenv.Path()))
 
 	// If a custom stdin is provided it will be as the stdin for the command
 	if stdin != nil {

starport/pkg/goenv/goenv.go

@@ -2,6 +2,7 @@
 package goenv
 
 import (
+	"fmt"
 	"go/build"
 	"os"
 	"path/filepath"
@@ -10,12 +11,32 @@ import (
 const (
 	// GOBIN is the env var for GOBIN.
 	GOBIN = "GOBIN"
+
+	// GOPATH is the env var for GOPATH.
+	GOPATH = "GOPATH"
 )
 
-// GetGOBIN returns the path of where Go binaries are installed.
-func GetGOBIN() string {
+const (
+	binDir = "bin"
+)
+
+// Bin returns the path of where Go binaries are installed.
+func Bin() string {
 	if binPath := os.Getenv(GOBIN); binPath != "" {
 		return binPath
 	}
-	return filepath.Join(build.Default.GOPATH, "bin")
+	if goPath := os.Getenv(GOPATH); goPath != "" {
+		return filepath.Join(goPath, binDir)
+	}
+	return filepath.Join(build.Default.GOPATH, binDir)
+}
+
+// Path returns $PATH with correct go bin configuration set.
+func Path() string {
+	return os.ExpandEnv(fmt.Sprintf("$PATH:%s", Bin()))
+}
+
+// ConfigurePath configures the env with correct $PATH that has go bin setup.
+func ConfigurePath() error {
+	return os.Setenv("PATH", Path())
 }

starport/pkg/localfs/save.go

@@ -29,8 +29,8 @@ func SaveTemp(f fs.FS) (path string, cleanup func(), err error) {
 }
 
 // SaveBytesTemp saves data bytes to a temporary file location at path.
-func SaveBytesTemp(data []byte, perm os.FileMode) (path string, cleanup func(), err error) {
-	f, err := os.CreateTemp("", "")
+func SaveBytesTemp(data []byte, prefix string, perm os.FileMode) (path string, cleanup func(), err error) {
+	f, err := os.CreateTemp("", prefix)
 	if err != nil {
 		return
 	}

starport/pkg/nodetime/nodetime.go

@@ -71,13 +71,14 @@ func Binary() []byte {
 
 // Command setups the nodetime binary and returns the command needed to execute c.
 func Command(c CommandName) (command []string, cleanup func(), err error) {
-	path, cleanup, err := localfs.SaveBytesTemp(Binary(), 0755)
+	cs := string(c)
+	path, cleanup, err := localfs.SaveBytesTemp(Binary(), cs, 0755)
 	if err != nil {
 		return nil, nil, err
 	}
 	command = []string{
 		path,
-		string(c),
+		cs,
 	}
 	return command, cleanup, nil
 }

starport/pkg/protoc/protoc.go

@@ -39,7 +39,7 @@ func Generate(ctx context.Context, outDir, protoPath string, includePaths, proto
 	}
 
 	// setup protoc and global protos.
-	protocPath, cleanup, err := localfs.SaveBytesTemp(binary, 0755)
+	protocPath, cleanup, err := localfs.SaveBytesTemp(binary, "protoc", 0755)
 	if err != nil {
 		return err
 	}

starport/services/chain/build.go

@@ -112,7 +112,7 @@ func (c *Chain) buildSteps() (steps step.Steps, err error) {
 	))
 
 	addInstallStep := func(binaryName, mainPath string) {
-		installPath := filepath.Join(goenv.GetGOBIN(), binaryName)
+		installPath := filepath.Join(goenv.Bin(), binaryName)
 
 		steps.Add(step.New(step.NewOptions().
 			Add(