diff --git a/local-interchain/Makefile b/local-interchain/Makefile index 637308389..4df91e194 100644 --- a/local-interchain/Makefile +++ b/local-interchain/Makefile @@ -12,7 +12,7 @@ build: .PHONY: run run: - ../bin/local-ic $(filter-out $@,$(MAKECMDGOALS)) + go run ./cmd/local-ic $(filter-out $@,$(MAKECMDGOALS)) .PHONY: install install: diff --git a/local-interchain/cmd/local-ic/chains.go b/local-interchain/cmd/local-ic/chains.go index 004932086..6b52894b3 100644 --- a/local-interchain/cmd/local-ic/chains.go +++ b/local-interchain/cmd/local-ic/chains.go @@ -59,7 +59,3 @@ func GetFiles() []string { return fileNames } - -func init() { - rootCmd.AddCommand(chainsCmd) -} diff --git a/local-interchain/cmd/local-ic/main.go b/local-interchain/cmd/local-ic/main.go index bbcb4f8ef..a78af4c51 100644 --- a/local-interchain/cmd/local-ic/main.go +++ b/local-interchain/cmd/local-ic/main.go @@ -6,6 +6,10 @@ import ( ) func main() { + rootCmd.AddCommand(chainsCmd) + rootCmd.AddCommand(newChainCmd) + rootCmd.AddCommand(startCmd) + if err := rootCmd.Execute(); err != nil { fmt.Fprintf(os.Stderr, "error while executing your CLI. Err: %v\n", err) os.Exit(1) diff --git a/local-interchain/cmd/local-ic/new_chain.go b/local-interchain/cmd/local-ic/new_chain.go index f54079b11..3cdee61a8 100644 --- a/local-interchain/cmd/local-ic/new_chain.go +++ b/local-interchain/cmd/local-ic/new_chain.go @@ -180,7 +180,3 @@ func getOrDefault[T any](output string, defaultVal T) T { return any(text).(T) } - -func init() { - rootCmd.AddCommand(newChainCmd) -} diff --git a/local-interchain/cmd/local-ic/root.go b/local-interchain/cmd/local-ic/root.go index fdfc2a908..45d3dfff8 100644 --- a/local-interchain/cmd/local-ic/root.go +++ b/local-interchain/cmd/local-ic/root.go @@ -10,6 +10,7 @@ import ( ) var ( + // This must be global for the Makefile to build properly (ldflags). MakeFileInstallDirectory string ) diff --git a/local-interchain/cmd/local-ic/start_chain.go b/local-interchain/cmd/local-ic/start_chain.go index b1f7bedba..8bcd95b22 100644 --- a/local-interchain/cmd/local-ic/start_chain.go +++ b/local-interchain/cmd/local-ic/start_chain.go @@ -30,7 +30,3 @@ var startCmd = &cobra.Command{ interchain.StartChain(parentDir, configPath) }, } - -func init() { - rootCmd.AddCommand(startCmd) -}