diff options
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/ethkey/main.go | 3 | ||||
-rw-r--r-- | cmd/evm/main.go | 3 | ||||
-rw-r--r-- | cmd/geth/config.go | 2 | ||||
-rw-r--r-- | cmd/geth/consolecmd_test.go | 4 | ||||
-rw-r--r-- | cmd/geth/main.go | 3 | ||||
-rw-r--r-- | cmd/geth/misccmd.go | 3 | ||||
-rw-r--r-- | cmd/swarm/global-store/main.go | 4 | ||||
-rw-r--r-- | cmd/swarm/main.go | 2 | ||||
-rw-r--r-- | cmd/swarm/swarm-snapshot/main.go | 3 | ||||
-rw-r--r-- | cmd/utils/flags.go | 7 |
10 files changed, 21 insertions, 13 deletions
diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index c434da0c0..a8399ad7c 100644 --- a/cmd/ethkey/main.go +++ b/cmd/ethkey/main.go @@ -30,11 +30,12 @@ const ( // Git SHA1 commit hash of the release (set via linker flags) var gitCommit = "" +var gitDate = "" var app *cli.App func init() { - app = utils.NewApp(gitCommit, "an Ethereum key manager") + app = utils.NewApp(gitCommit, gitDate, "an Ethereum key manager") app.Commands = []cli.Command{ commandGenerate, commandInspect, diff --git a/cmd/evm/main.go b/cmd/evm/main.go index ebac2047a..a5159c6b7 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -27,9 +27,10 @@ import ( ) var gitCommit = "" // Git SHA1 commit hash of the release (set via linker flags) +var gitDate = "" var ( - app = utils.NewApp(gitCommit, "the evm command line interface") + app = utils.NewApp(gitCommit, gitDate, "the evm command line interface") DebugFlag = cli.BoolFlag{ Name: "debug", diff --git a/cmd/geth/config.go b/cmd/geth/config.go index f316380ce..8f0bae822 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -101,7 +101,7 @@ func loadConfig(file string, cfg *gethConfig) error { func defaultNodeConfig() node.Config { cfg := node.DefaultConfig cfg.Name = clientIdentifier - cfg.Version = params.VersionWithCommit(gitCommit) + cfg.Version = params.VersionWithCommit(gitCommit, gitDate) cfg.HTTPModules = append(cfg.HTTPModules, "eth", "shh") cfg.WSModules = append(cfg.WSModules, "eth", "shh") cfg.IPCPath = "geth.ipc" diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index 34ba87702..436045119 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -50,7 +50,7 @@ func TestConsoleWelcome(t *testing.T) { geth.SetTemplateFunc("goos", func() string { return runtime.GOOS }) geth.SetTemplateFunc("goarch", func() string { return runtime.GOARCH }) geth.SetTemplateFunc("gover", runtime.Version) - geth.SetTemplateFunc("gethver", func() string { return params.VersionWithMeta }) + geth.SetTemplateFunc("gethver", func() string { return params.VersionWithCommit("", "") }) geth.SetTemplateFunc("niltime", func() string { return time.Unix(0, 0).Format(time.RFC1123) }) geth.SetTemplateFunc("apis", func() string { return ipcAPIs }) @@ -133,7 +133,7 @@ func testAttachWelcome(t *testing.T, geth *testgeth, endpoint, apis string) { attach.SetTemplateFunc("goos", func() string { return runtime.GOOS }) attach.SetTemplateFunc("goarch", func() string { return runtime.GOARCH }) attach.SetTemplateFunc("gover", runtime.Version) - attach.SetTemplateFunc("gethver", func() string { return params.VersionWithMeta }) + attach.SetTemplateFunc("gethver", func() string { return params.VersionWithCommit("", "") }) attach.SetTemplateFunc("etherbase", func() string { return geth.Etherbase }) attach.SetTemplateFunc("niltime", func() string { return time.Unix(0, 0).Format(time.RFC1123) }) attach.SetTemplateFunc("ipc", func() bool { return strings.HasPrefix(endpoint, "ipc") }) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 0e89481fe..838029333 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -50,8 +50,9 @@ const ( var ( // Git SHA1 commit hash of the release (set via linker flags) gitCommit = "" + gitDate = "" // The app that holds all commands and flags. - app = utils.NewApp(gitCommit, "the go-ethereum command line interface") + app = utils.NewApp(gitCommit, gitDate, "the go-ethereum command line interface") // flags that configure the node nodeFlags = []cli.Flag{ utils.IdentityFlag, diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index f62e25478..39ca47872 100644 --- a/cmd/geth/misccmd.go +++ b/cmd/geth/misccmd.go @@ -112,6 +112,9 @@ func version(ctx *cli.Context) error { if gitCommit != "" { fmt.Println("Git Commit:", gitCommit) } + if gitDate != "" { + fmt.Println("Git Commit Date:", gitDate) + } fmt.Println("Architecture:", runtime.GOARCH) fmt.Println("Protocol Versions:", eth.ProtocolVersions) fmt.Println("Network Id:", eth.DefaultConfig.NetworkId) diff --git a/cmd/swarm/global-store/main.go b/cmd/swarm/global-store/main.go index 52fafc8f6..58505f988 100644 --- a/cmd/swarm/global-store/main.go +++ b/cmd/swarm/global-store/main.go @@ -26,6 +26,7 @@ import ( var ( version = "0.1" gitCommit string // Git SHA1 commit hash of the release (set via linker flags) + gitDate string ) func main() { @@ -45,6 +46,9 @@ func newApp() (app *cli.App) { if len(gitCommit) >= 8 { app.Version += "-" + gitCommit[:8] } + if gitDate != "" { + app.Version += "-" + gitDate + } app.Usage = "Swarm Global Store" // app flags (for all commands) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index a4041eb3d..f4c1dd688 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -102,7 +102,7 @@ func init() { utils.ListenPortFlag.Value = 30399 } -var app = utils.NewApp("", "Ethereum Swarm") +var app = utils.NewApp("", "", "Ethereum Swarm") // This init function creates the cli.App. func init() { diff --git a/cmd/swarm/swarm-snapshot/main.go b/cmd/swarm/swarm-snapshot/main.go index 136295e51..4a1e8b4f5 100644 --- a/cmd/swarm/swarm-snapshot/main.go +++ b/cmd/swarm/swarm-snapshot/main.go @@ -25,6 +25,7 @@ import ( ) var gitCommit string // Git SHA1 commit hash of the release (set via linker flags) +var gitDate string // default value for "create" command --nodes flag const defaultNodes = 8 @@ -40,7 +41,7 @@ func main() { // newApp construct a new instance of Swarm Snapshot Utility. // Method Run is called on it in the main function and in tests. func newApp() (app *cli.App) { - app = utils.NewApp(gitCommit, "Swarm Snapshot Utility") + app = utils.NewApp(gitCommit, gitDate, "Swarm Snapshot Utility") app.Name = "swarm-snapshot" app.Usage = "" diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index ab4060dd2..2dc45cbba 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -92,16 +92,13 @@ GLOBAL OPTIONS: } // NewApp creates an app with sane defaults. -func NewApp(gitCommit, usage string) *cli.App { +func NewApp(gitCommit, gitDate, usage string) *cli.App { app := cli.NewApp() app.Name = filepath.Base(os.Args[0]) app.Author = "" //app.Authors = nil app.Email = "" - app.Version = params.VersionWithMeta - if len(gitCommit) >= 8 { - app.Version += "-" + gitCommit[:8] - } + app.Version = params.VersionWithCommit(gitCommit, gitDate) app.Usage = usage return app } |