aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/ethereum/flags.go
diff options
context:
space:
mode:
authorMaran <maran.hidskes@gmail.com>2015-02-23 18:28:20 +0800
committerMaran <maran.hidskes@gmail.com>2015-02-23 18:28:20 +0800
commit40adb7feb657cd1cb2e4c7a02c8a9db95b18e67c (patch)
tree98c3bae13e0483cfd6a8919b9b5a848f72d79071 /cmd/ethereum/flags.go
parentdd086791acf477da7641c168f82de70ed0b2dca6 (diff)
downloadgo-tangerine-40adb7feb657cd1cb2e4c7a02c8a9db95b18e67c.tar.gz
go-tangerine-40adb7feb657cd1cb2e4c7a02c8a9db95b18e67c.tar.zst
go-tangerine-40adb7feb657cd1cb2e4c7a02c8a9db95b18e67c.zip
Implement OS sensitive dataDirs
Diffstat (limited to 'cmd/ethereum/flags.go')
-rw-r--r--cmd/ethereum/flags.go11
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)")