fix(init): simpler initialization logic
@jbenet this removes everything under the path
Brian Tiger Chow committed
Jan 13, 2015 at 00:18 UTC
97b865ff6fc3447735c484b2ad6a3786ecf9d63b
1 file changed
+4
-17
cmd/ipfs/init.go
+4
-17
@@ -95,27 +95,14 @@ func doInit(repoRoot string, force bool, nBitsForKeypair int) (interface{}, erro
95
if err != nil {
96
return nil, err
97
}
98
-
99
- if !fsrepo.IsInitialized(repoRoot) {
100
- if err := fsrepo.Init(repoRoot, conf); err != nil {
101
- return nil, err
102
- }
103
- } else {
98
+ if fsrepo.IsInitialized(repoRoot) {
99
if err := fsrepo.Remove(repoRoot); err != nil {
100
return nil, err
101
}
107
- r := fsrepo.At(repoRoot)
108
- if err := r.Open(); err != nil {
109
- return nil, err
110
- }
111
- if err := r.SetConfig(conf); err != nil {
112
- return nil, err
113
- }
114
- if err := r.Close(); err != nil {
115
- return nil, err
116
- }
102
}
118
-
103
+ if err := fsrepo.Init(repoRoot, conf); err != nil {
104
+ return nil, err
105
+ }
106
if err := repo.ConfigureEventLogger(conf.Logs); err != nil {
107
return nil, err
108
}