diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-27 03:21:41 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-27 03:21:41 +0800 |
| commit | 76f6d75ef867e754264834fc7171d1a12f24c5bb (patch) | |
| tree | a9531d9e14c15abd72625a98a21a9b988dc32319 /cmd/ethereum | |
| parent | b2a225a52e45315f3ec90e11707fefa6059d13f5 (diff) | |
| parent | fa7deb10f636d89f668249b78792f8cc48146ee8 (diff) | |
| download | dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.gz dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.bz2 dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.lz dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.xz dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.zst dexon-76f6d75ef867e754264834fc7171d1a12f24c5bb.zip | |
Merge branch 'master' into hotfix/0.8.5-2
Diffstat (limited to 'cmd/ethereum')
| -rw-r--r-- | cmd/ethereum/flags.go | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go index 577bee442..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)") |