fix(cosmos): also look for ag-chain-cosmos in the agd directory

golang/cosmos/cmd/agd/find_binary.go

@@ -0,0 +1,46 @@
+package main
+
+import (
+	"os"
+	"os/exec"
+	"path/filepath"
+)
+
+// FindBinaryNextToMe looks for binName next to the current executable.
+// It returns an absolute filename for binName, or an error.
+func FindBinaryNextToMe(binName string) (string, error) {
+	ex, err := os.Executable()
+	if err != nil {
+		return "", err
+	}
+
+	// Calculate the binary's filename.
+	bin := filepath.Join(filepath.Dir(ex), binName)
+
+	// Take the absolute path.
+	bin, err = filepath.Abs(bin)
+	if err != nil {
+		return "", err
+	}
+
+	// Check that the binary exists.
+	if _, err := os.Stat(bin); err != nil {
+		return "", err
+	}
+	return bin, nil
+}
+
+// FindBinary looks for binName in the following locations:
+// 1. The executable's directory
+// 2. The system PATH
+//
+// It returns the absolute filename for binName if it is found, otherwise an
+// error.
+func FindBinary(binName string) (string, error) {
+	if binary, err := FindBinaryNextToMe(binName); err == nil {
+		return binary, nil
+	}
+
+	// Check the system PATH.
+	return exec.LookPath(binName)
+}

golang/cosmos/cmd/agd/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"os"
-	"os/exec"
 	"syscall"
 
 	"github.com/tendermint/tendermint/libs/log"
@@ -15,16 +14,16 @@ import (
 func main() {
 	// We need to delegate to our default app for running the actual chain.
 	daemoncmd.OnStartHook = func(logger log.Logger) {
-		logger.Info("Start chain delegating to ag-chain-cosmos executable")
+		args := []string{"ag-chain-cosmos", "--home", gaia.DefaultNodeHome}
+		args = append(args, os.Args[1:]...)
+
+		logger.Info("Start chain delegating to JS executable", "args", args)
 
-		binary, lookErr := exec.LookPath("ag-chain-cosmos")
+		binary, lookErr := FindBinary(args[0])
 		if lookErr != nil {
 			panic(lookErr)
 		}
 
-		args := []string{"ag-chain-cosmos", "--home", gaia.DefaultNodeHome}
-		args = append(args, os.Args[1:]...)
-
 		execErr := syscall.Exec(binary, args, os.Environ())
 		if execErr != nil {
 			panic(execErr)