Use config.NewConfiguration to setup a new configuration

cmaglie · cmaglie · commit c226f62fb7c7 · 2019-02-27T15:32:10.000+01:00
diff --git a/commands/instances.go b/commands/instances.go
@@ -55,10 +55,12 @@ func Init(ctx context.Context, req *rpc.InitReq) (*rpc.InitResp, error) {
 		return nil, fmt.Errorf("invalid request")
 	}
 
-	config := &configs.Configuration{
-		DataDir:       paths.New(inConfig.DataDir),
-		SketchbookDir: paths.New(inConfig.SketchbookDir),
+	config, err := configs.NewConfiguration()
+	if err != nil {
+		return nil, fmt.Errorf("getting default config values: %s", err)
 	}
+	config.DataDir = paths.New(inConfig.DataDir)
+	config.SketchbookDir = paths.New(inConfig.SketchbookDir)
 	if inConfig.DownloadsDir != "" {
 		config.ArduinoDownloadsDir = paths.New(inConfig.DownloadsDir)
 	}

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,12 @@ func Init(ctx context.Context, req rpc.InitReq) (rpc.InitResp, error) {`
`55`	`55`	`return nil, fmt.Errorf("invalid request")`
`56`	`56`	`}`
`57`	`57`
`58`		`- config := &configs.Configuration{`
`59`		`- DataDir: paths.New(inConfig.DataDir),`
`60`		`- SketchbookDir: paths.New(inConfig.SketchbookDir),`
	`58`	`+ config, err := configs.NewConfiguration()`
	`59`	`+ if err != nil {`
	`60`	`+ return nil, fmt.Errorf("getting default config values: %s", err)`
`61`	`61`	`}`
	`62`	`+ config.DataDir = paths.New(inConfig.DataDir)`
	`63`	`+ config.SketchbookDir = paths.New(inConfig.SketchbookDir)`
`62`	`64`	`if inConfig.DownloadsDir != "" {`
`63`	`65`	`config.ArduinoDownloadsDir = paths.New(inConfig.DownloadsDir)`
`64`	`66`	`}`