aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-04-13 22:28:09 +0800
committerGitHub <noreply@github.com>2017-04-13 22:28:09 +0800
commitee05cc4a2738130315a689351cc536fdb1f4bbab (patch)
tree025c48cfe38e2da4a09ab02b2b3bd7ce8c5692d2
parent732b75325ca989db1ce51c334560a5f015b136ba (diff)
parent97f38ce4d6073544ac5f1fa10c318d3eae716258 (diff)
downloadgo-tangerine-ee05cc4a2738130315a689351cc536fdb1f4bbab.tar
go-tangerine-ee05cc4a2738130315a689351cc536fdb1f4bbab.tar.gz
go-tangerine-ee05cc4a2738130315a689351cc536fdb1f4bbab.tar.bz2
go-tangerine-ee05cc4a2738130315a689351cc536fdb1f4bbab.tar.lz
go-tangerine-ee05cc4a2738130315a689351cc536fdb1f4bbab.tar.xz
go-tangerine-ee05cc4a2738130315a689351cc536fdb1f4bbab.tar.zst
go-tangerine-ee05cc4a2738130315a689351cc536fdb1f4bbab.zip
Merge pull request #14327 from karalabe/flag-group-fixes
cmd/geth: update flag groups in the geth command usage
-rw-r--r--cmd/geth/main.go2
-rw-r--r--cmd/geth/usage.go17
2 files changed, 14 insertions, 5 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 5fb50c4ad..c2d719d95 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -55,7 +55,7 @@ func init() {
// Initialize the CLI app and start Geth
app.Action = geth
app.HideVersion = true // we have a command to print the version
- app.Copyright = "Copyright 2013-2016 The go-ethereum Authors"
+ app.Copyright = "Copyright 2013-2017 The go-ethereum Authors"
app.Commands = []cli.Command{
// See chaincmd.go:
initCommand,
diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
index a172b4775..457728154 100644
--- a/cmd/geth/usage.go
+++ b/cmd/geth/usage.go
@@ -30,7 +30,7 @@ import (
var AppHelpTemplate = `NAME:
{{.App.Name}} - {{.App.Usage}}
- Copyright 2013-2016 The go-ethereum Authors
+ Copyright 2013-2017 The go-ethereum Authors
USAGE:
{{.App.HelpName}} [options]{{if .App.Commands}} command [command options]{{end}} {{if .App.ArgsUsage}}{{.App.ArgsUsage}}{{else}}[arguments...]{{end}}
@@ -64,14 +64,15 @@ var AppHelpFlagGroups = []flagGroup{
{
Name: "ETHEREUM",
Flags: []cli.Flag{
+ configFileFlag,
utils.DataDirFlag,
utils.KeyStoreDirFlag,
utils.NetworkIdFlag,
utils.TestNetFlag,
utils.DevModeFlag,
+ utils.SyncModeFlag,
+ utils.EthStatsURLFlag,
utils.IdentityFlag,
- utils.FastSyncFlag,
- utils.LightModeFlag,
utils.LightServFlag,
utils.LightPeersFlag,
utils.LightKDFFlag,
@@ -132,6 +133,7 @@ var AppHelpFlagGroups = []flagGroup{
utils.NATFlag,
utils.NoDiscoverFlag,
utils.DiscoveryV5Flag,
+ utils.NetrestrictFlag,
utils.NodeKeyFileFlag,
utils.NodeKeyHexFlag,
},
@@ -163,12 +165,19 @@ var AppHelpFlagGroups = []flagGroup{
{
Name: "LOGGING AND DEBUGGING",
Flags: append([]cli.Flag{
- utils.EthStatsURLFlag,
utils.MetricsEnabledFlag,
utils.FakePoWFlag,
+ utils.NoCompactionFlag,
}, debug.Flags...),
},
{
+ Name: "DEPRECATED",
+ Flags: []cli.Flag{
+ utils.FastSyncFlag,
+ utils.LightModeFlag,
+ },
+ },
+ {
Name: "EXPERIMENTAL",
Flags: []cli.Flag{
utils.WhisperEnabledFlag,