diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-29 19:43:38 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-29 19:43:38 +0800 |
| commit | bac4440e1751fd3b71f8271260d1c8af236d2cec (patch) | |
| tree | 7244f37c5c6120ecfb2afd996495bbb4a4810d7e /cmd/mist/main.go | |
| parent | 32373e3837c5fc3def8050d6de8be34946a3fd75 (diff) | |
| parent | aa03e53ca8d55e74e562f5f56d90e4fd2579fb4e (diff) | |
| download | dexon-bac4440e1751fd3b71f8271260d1c8af236d2cec.tar dexon-bac4440e1751fd3b71f8271260d1c8af236d2cec.tar.gz dexon-bac4440e1751fd3b71f8271260d1c8af236d2cec.tar.bz2 dexon-bac4440e1751fd3b71f8271260d1c8af236d2cec.tar.lz dexon-bac4440e1751fd3b71f8271260d1c8af236d2cec.tar.xz dexon-bac4440e1751fd3b71f8271260d1c8af236d2cec.tar.zst dexon-bac4440e1751fd3b71f8271260d1c8af236d2cec.zip | |
Merge pull request #822 from fjl/makefile-improvements
Makefile improvements
Diffstat (limited to 'cmd/mist/main.go')
| -rw-r--r-- | cmd/mist/main.go | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/cmd/mist/main.go b/cmd/mist/main.go index 6780cfb3a..1030d6ada 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -41,6 +41,9 @@ const ( ) var ( + gitCommit string // set via linker flag + nodeNameVersion string + app = utils.NewApp(Version, "the ether browser") assetPathFlag = cli.StringFlag{ Name: "asset_path", @@ -55,6 +58,11 @@ func init() { if len(rpcCorsFlag.Value) == 0 { rpcCorsFlag.Value = "http://localhost" } + if gitCommit == "" { + nodeNameVersion = Version + } else { + nodeNameVersion = Version + "-" + gitCommit[:8] + } app.Action = run app.Flags = []cli.Flag{ @@ -74,6 +82,7 @@ func init() { utils.RPCPortFlag, utils.JSpathFlag, utils.ProtocolVersionFlag, + utils.BlockchainVersionFlag, utils.NetworkIdFlag, } } @@ -106,7 +115,8 @@ func run(ctx *cli.Context) { tstart := time.Now() // TODO: show qml popup instead of exiting if initialization fails. - cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx) + cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx) + cfg.Shh = true ethereum, err := eth.New(cfg) if err != nil { utils.Fatalf("%v", err) |