aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/utils
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-05-13 01:05:33 +0800
committerobscuren <geffobscura@gmail.com>2015-05-13 01:05:33 +0800
commit8e24378cc1acb074b56de75bf0baf6feb7927677 (patch)
tree71f866652de6b45da5ad4403b88f5def9a684e36 /cmd/utils
parent7d69679935ff8c04aebb60f27074f08c5e84ac95 (diff)
parent8fe01b4bfa28ad5a1fdde7f9837e8f982843389a (diff)
downloadgo-tangerine-0.9.20.tar
go-tangerine-0.9.20.tar.gz
go-tangerine-0.9.20.tar.bz2
go-tangerine-0.9.20.tar.lz
go-tangerine-0.9.20.tar.xz
go-tangerine-0.9.20.tar.zst
go-tangerine-0.9.20.zip
Merge branch 'release/0.9.20'v0.9.20
Diffstat (limited to 'cmd/utils')
-rw-r--r--cmd/utils/flags.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index dd3b6c8a2..ddbd36b5c 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, "keystore"))
return accounts.NewManager(ks)
}