Prompt user to accept legalese when datadir doesn't exist

This commit is contained in:
Taylor Gerring
2015-07-16 12:27:42 +02:00
parent 9addb3df3a
commit 1909d26fe2
2 changed files with 22 additions and 6 deletions

View File

@ -346,6 +346,7 @@ func main() {
func run(ctx *cli.Context) {
cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx)
utils.CheckLegalese(cfg.DataDir)
ethereum, err := eth.New(cfg)
if err != nil {
utils.Fatalf("%v", err)
@ -404,6 +405,7 @@ func console(ctx *cli.Context) {
}
cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx)
utils.CheckLegalese(cfg.DataDir)
ethereum, err := eth.New(cfg)
if err != nil {
utils.Fatalf("%v", err)
@ -434,6 +436,7 @@ func console(ctx *cli.Context) {
func execJSFiles(ctx *cli.Context) {
cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx)
utils.CheckLegalese(cfg.DataDir)
ethereum, err := eth.New(cfg)
if err != nil {
utils.Fatalf("%v", err)
@ -487,6 +490,8 @@ func blockRecovery(ctx *cli.Context) {
}
cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx)
utils.CheckLegalese(cfg.DataDir)
blockDb, err := ethdb.NewLDBDatabase(filepath.Join(cfg.DataDir, "blockchain"))
if err != nil {
glog.Fatalln("could not open db:", err)