diff options
author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-12 23:23:46 +0800 |
---|---|---|
committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-12 23:23:46 +0800 |
commit | 58d6ec689ff44232cd5d6a7cbbaad2d7a2cb44bd (patch) | |
tree | a5bfb1a0ade11c7f68d0322b9773e8c46571c455 /cmd/utils | |
parent | f87094b660c95b547486e7439620e68f3d59c45f (diff) | |
parent | 899df30c24c85ca0b2dadd4cbb251a4ec5ca1a75 (diff) | |
download | dexon-58d6ec689ff44232cd5d6a7cbbaad2d7a2cb44bd.tar dexon-58d6ec689ff44232cd5d6a7cbbaad2d7a2cb44bd.tar.gz dexon-58d6ec689ff44232cd5d6a7cbbaad2d7a2cb44bd.tar.bz2 dexon-58d6ec689ff44232cd5d6a7cbbaad2d7a2cb44bd.tar.lz dexon-58d6ec689ff44232cd5d6a7cbbaad2d7a2cb44bd.tar.xz dexon-58d6ec689ff44232cd5d6a7cbbaad2d7a2cb44bd.tar.zst dexon-58d6ec689ff44232cd5d6a7cbbaad2d7a2cb44bd.zip |
Merge pull request #933 from bas-vk/issue928
replaced path with platform aware filepath module
Diffstat (limited to 'cmd/utils')
-rw-r--r-- | cmd/utils/flags.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index dd3b6c8a2..339dd3f47 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -7,7 +7,7 @@ import ( "math/big" "net/http" "os" - "path" + "path/filepath" "runtime" "github.com/codegangsta/cli" @@ -55,7 +55,7 @@ OPTIONS: // NewApp creates an app with sane defaults. func NewApp(version, usage string) *cli.App { app := cli.NewApp() - app.Name = path.Base(os.Args[0]) + app.Name = filepath.Base(os.Args[0]) app.Author = "" //app.Authors = nil app.Email = "" @@ -319,17 +319,17 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config { func GetChain(ctx *cli.Context) (*core.ChainManager, common.Database, common.Database) { dataDir := ctx.GlobalString(DataDirFlag.Name) - blockDb, err := ethdb.NewLDBDatabase(path.Join(dataDir, "blockchain")) + blockDb, err := ethdb.NewLDBDatabase(filepath.Join(dataDir, "blockchain")) if err != nil { Fatalf("Could not open database: %v", err) } - stateDb, err := ethdb.NewLDBDatabase(path.Join(dataDir, "state")) + stateDb, err := ethdb.NewLDBDatabase(filepath.Join(dataDir, "state")) if err != nil { Fatalf("Could not open database: %v", err) } - extraDb, err := ethdb.NewLDBDatabase(path.Join(dataDir, "extra")) + extraDb, err := ethdb.NewLDBDatabase(filepath.Join(dataDir, "extra")) if err != nil { Fatalf("Could not open database: %v", err) } @@ -346,7 +346,7 @@ func GetChain(ctx *cli.Context) (*core.ChainManager, common.Database, common.Dat func GetAccountManager(ctx *cli.Context) *accounts.Manager { dataDir := ctx.GlobalString(DataDirFlag.Name) - ks := crypto.NewKeyStorePassphrase(path.Join(dataDir, "keys")) + ks := crypto.NewKeyStorePassphrase(filepath.Join(dataDir, "keys")) return accounts.NewManager(ks) } |