@@ -24,11 +24,10 @@ import (
24
24
"os"
25
25
"path/filepath"
26
26
27
- "github.com/arduino/arduino-cli/commands"
28
-
29
27
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
30
28
"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
31
29
"github.com/arduino/arduino-cli/arduino/sketches"
30
+ "github.com/arduino/arduino-cli/commands"
32
31
"github.com/arduino/arduino-cli/common/formatter"
33
32
"github.com/arduino/arduino-cli/configs"
34
33
"github.com/arduino/arduino-cli/rpc"
@@ -102,14 +101,15 @@ func packageManagerInitReq() *rpc.InitReq {
102
101
urls = append (urls , URL .String ())
103
102
}
104
103
105
- req := & rpc.InitReq {
106
- Configuration : & rpc. Configuration {
107
- DataDir : Config .DataDir .String (),
108
- DownloadsDir : Config . DownloadsDir (). String (),
109
- BoardManagerAdditionalUrls : urls ,
110
- },
104
+ conf := & rpc.Configuration {}
105
+ conf . DataDir = Config . DataDir . String ()
106
+ conf . DownloadsDir = Config .DownloadsDir () .String ()
107
+ conf . BoardManagerAdditionalUrls = urls
108
+ if Config . SketchbookDir != nil {
109
+ conf . SketchbookDir = Config . SketchbookDir . String ()
111
110
}
112
- return req
111
+
112
+ return & rpc.InitReq {Configuration : conf }
113
113
}
114
114
115
115
// CreateInstance creates and return an instance of the Arduino Core engine
0 commit comments