diff options
| author | Ethan Buchman <ethan@coinculture.info> | 2015-02-27 06:54:57 +0800 |
|---|---|---|
| committer | Ethan Buchman <ethan@coinculture.info> | 2015-02-27 06:54:57 +0800 |
| commit | 5a827417d9cef0d2a765df11e747b1755bf04898 (patch) | |
| tree | cd3764686dcb59f5b1b9faf16c9f29dcc5efd593 /cmd/ethereum/flags.go | |
| parent | 9446489cf3f2eb4b5237b9355b3975fde2886508 (diff) | |
| parent | cc5c8a444dbc23501ba1a131eb2334f4b5e1ce9f (diff) | |
| download | go-tangerine-5a827417d9cef0d2a765df11e747b1755bf04898.tar go-tangerine-5a827417d9cef0d2a765df11e747b1755bf04898.tar.gz go-tangerine-5a827417d9cef0d2a765df11e747b1755bf04898.tar.bz2 go-tangerine-5a827417d9cef0d2a765df11e747b1755bf04898.tar.lz go-tangerine-5a827417d9cef0d2a765df11e747b1755bf04898.tar.xz go-tangerine-5a827417d9cef0d2a765df11e747b1755bf04898.tar.zst go-tangerine-5a827417d9cef0d2a765df11e747b1755bf04898.zip | |
Merge branch 'develop' of https://github.com/ethereum/go-ethereum into develop
Diffstat (limited to 'cmd/ethereum/flags.go')
| -rw-r--r-- | cmd/ethereum/flags.go | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go index 1e6869a69..7d410c8e4 100644 --- a/cmd/ethereum/flags.go +++ b/cmd/ethereum/flags.go @@ -26,10 +26,10 @@ import ( "fmt" "log" "os" - "os/user" "path" "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/p2p/nat" "github.com/ethereum/go-ethereum/vm" @@ -79,12 +79,7 @@ var ( InputFile string ) -func defaultDataDir() string { - usr, _ := user.Current() - return path.Join(usr.HomeDir, ".ethereum") -} - -var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini") +var defaultConfigFile = path.Join(ethutil.DefaultDataDir(), "conf.ini") func Init() { // TODO: move common flag processing to cmd/util @@ -107,7 +102,7 @@ func Init() { flag.StringVar(&SecretFile, "import", "", "imports the file given (hex or mnemonic formats)") flag.StringVar(&ExportDir, "export", "", "exports the session keyring to files in the directory given") flag.StringVar(&LogFile, "logfile", "", "log file (defaults to standard output)") - flag.StringVar(&Datadir, "datadir", defaultDataDir(), "specifies the datadir to use") + flag.StringVar(&Datadir, "datadir", ethutil.DefaultDataDir(), "specifies the datadir to use") flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file") flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)") flag.IntVar(&LogLevel, "loglevel", int(logger.InfoLevel), "loglevel: 0-5: silent,error,warn,info,debug,debug detail)") @@ -132,7 +127,7 @@ func Init() { natstr = flag.String("nat", "any", "port mapping mechanism (any|none|upnp|pmp|extip:<IP>)") ) flag.BoolVar(&Dial, "dial", true, "dial out connections (default on)") - flag.BoolVar(&SHH, "shh", true, "run whisper protocol (default on)") + //flag.BoolVar(&SHH, "shh", true, "run whisper protocol (default on)") flag.StringVar(&OutboundPort, "port", "30303", "listening port") flag.StringVar(&BootNodes, "bootnodes", "", "space-separated node URLs for discovery bootstrap") |