From 97b865ff6fc3447735c484b2ad6a3786ecf9d63b Mon Sep 17 00:00:00 2001 From: Brian Tiger Chow Date: Tue, 13 Jan 2015 00:18:53 -0800 Subject: [PATCH] fix(init): simpler initialization logic @jbenet this removes everything under the path --- cmd/ipfs/init.go | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go index 29f5dbe39..ee3bd92d4 100644 --- a/cmd/ipfs/init.go +++ b/cmd/ipfs/init.go @@ -95,27 +95,14 @@ func doInit(repoRoot string, force bool, nBitsForKeypair int) (interface{}, erro if err != nil { return nil, err } - - if !fsrepo.IsInitialized(repoRoot) { - if err := fsrepo.Init(repoRoot, conf); err != nil { - return nil, err - } - } else { + if fsrepo.IsInitialized(repoRoot) { if err := fsrepo.Remove(repoRoot); err != nil { return nil, err } - r := fsrepo.At(repoRoot) - if err := r.Open(); err != nil { - return nil, err - } - if err := r.SetConfig(conf); err != nil { - return nil, err - } - if err := r.Close(); err != nil { - return nil, err - } } - + if err := fsrepo.Init(repoRoot, conf); err != nil { + return nil, err + } if err := repo.ConfigureEventLogger(conf.Logs); err != nil { return nil, err }