From a99d913982d0e1f6c9bc33a4b9ca150657d86bc8 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Wed, 14 Feb 2018 18:57:48 +0100 Subject: [PATCH] Extract version command to common location --- examples/gaia/gaiacli/main.go | 4 ++- examples/gaia/gaiad/main.go | 3 ++- examples/gaia/gaiad/version.go | 26 ------------------- .../gaiacli/version.go => version/command.go | 10 +++---- 4 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 examples/gaia/gaiad/version.go rename examples/gaia/gaiacli/version.go => version/command.go (67%) diff --git a/examples/gaia/gaiacli/main.go b/examples/gaia/gaiacli/main.go index 6321e25ee7..dce125acbb 100644 --- a/examples/gaia/gaiacli/main.go +++ b/examples/gaia/gaiacli/main.go @@ -7,6 +7,8 @@ import ( "github.com/spf13/cobra" "github.com/tendermint/tmlibs/cli" + + "github.com/cosmos/cosmos-sdk/version" ) const ( @@ -66,7 +68,7 @@ func main() { serveCommand(), KeyCommands(), lineBreak, - VersionCmd, + version.VersionCmd, ) // prepare and add flags diff --git a/examples/gaia/gaiad/main.go b/examples/gaia/gaiad/main.go index ca9bb20dba..544cd03e2b 100644 --- a/examples/gaia/gaiad/main.go +++ b/examples/gaia/gaiad/main.go @@ -9,6 +9,7 @@ import ( "github.com/tendermint/tmlibs/cli" "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/version" ) const ( @@ -35,7 +36,7 @@ func main() { AddNodeCommands(gaiadCmd, node) gaiadCmd.AddCommand( - VersionCmd, + version.VersionCmd, ) // prepare and add flags diff --git a/examples/gaia/gaiad/version.go b/examples/gaia/gaiad/version.go deleted file mode 100644 index 59fd799c07..0000000000 --- a/examples/gaia/gaiad/version.go +++ /dev/null @@ -1,26 +0,0 @@ -package main - -import ( - "fmt" - - "github.com/spf13/cobra" - - "github.com/cosmos/cosmos-sdk/version" -) - -var ( - // VersionCmd prints out the current sdk version - VersionCmd = &cobra.Command{ - Use: "version", - Short: "Print the app version", - Run: doVersionCmd, - } -) - -func doVersionCmd(cmd *cobra.Command, args []string) { - v := version.Version - if version.GitCommit != "" { - v = v + " " + version.GitCommit - } - fmt.Println(v) -} diff --git a/examples/gaia/gaiacli/version.go b/version/command.go similarity index 67% rename from examples/gaia/gaiacli/version.go rename to version/command.go index 59fd799c07..9986f605d7 100644 --- a/examples/gaia/gaiacli/version.go +++ b/version/command.go @@ -1,11 +1,9 @@ -package main +package version import ( "fmt" "github.com/spf13/cobra" - - "github.com/cosmos/cosmos-sdk/version" ) var ( @@ -18,9 +16,9 @@ var ( ) func doVersionCmd(cmd *cobra.Command, args []string) { - v := version.Version - if version.GitCommit != "" { - v = v + " " + version.GitCommit + v := Version + if GitCommit != "" { + v = v + " " + GitCommit } fmt.Println(v) }