refactor(init): write config at top level
Brian Tiger Chow committed
Jan 12, 2015 at 11:09 UTC
a2d1e3395e915390ae4329e52acd7d92fa4a3852
1 file changed
+6
-6
cmd/ipfs/init.go
+6
-6
@@ -104,11 +104,15 @@ func doInit(configRoot string, dspathOverride string, force bool, nBitsForKeypai
104
return nil, errCannotInitConfigExists
105
}
106
107
- conf, err := initConfig(configFilename, dspathOverride, nBitsForKeypair)
107
+ conf, err := initConfig(dspathOverride, nBitsForKeypair)
108
if err != nil {
109
return nil, err
110
}
111
112
+ if err := config.WriteConfigFile(configFilename, conf); err != nil {
113
+ return nil, err
114
+ }
115
+
116
err = addTheWelcomeFile(conf)
117
if err != nil {
118
return nil, err
@@ -165,7 +169,7 @@ func datastoreConfig(dspath string) (config.Datastore, error) {
169
return ds, nil
170
}
171
168
-func initConfig(configFilename string, dspathOverride string, nBitsForKeypair int) (*config.Config, error) {
172
+func initConfig(dspathOverride string, nBitsForKeypair int) (*config.Config, error) {
173
ds, err := datastoreConfig(dspathOverride)
174
if err != nil {
175
return nil, err
@@ -214,10 +218,6 @@ func initConfig(configFilename string, dspathOverride string, nBitsForKeypair in
218
Version: config.VersionDefaultValue(),
219
}
220
217
- if err := config.WriteConfigFile(configFilename, conf); err != nil {
218
- return nil, err
219
- }
220
-
221
return conf, nil
222
}
223