Skip to content

Commit ddd1fa4

Browse files
committed
Get arduino-cli data dir using 'config get' command
1 parent 937ad84 commit ddd1fa4

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

Diff for: ls/ls.go

+5-13
Original file line numberDiff line numberDiff line change
@@ -1455,9 +1455,8 @@ func (ls *INOLanguageServer) extractDataFolderFromArduinoCLI(logger jsonrpc.Func
14551455
} else {
14561456
args := []string{
14571457
"--config-file", ls.config.CliConfigPath.String(),
1458-
"config",
1459-
"dump",
1460-
"--format", "json",
1458+
"config", "get", "directories.data",
1459+
"--json",
14611460
}
14621461
cmd, err := paths.NewProcessFromPath(nil, ls.config.CliPath, args...)
14631462
if err != nil {
@@ -1470,20 +1469,13 @@ func (ls *INOLanguageServer) extractDataFolderFromArduinoCLI(logger jsonrpc.Func
14701469
return nil, errors.Errorf("running %s: %s", strings.Join(args, " "), err)
14711470
}
14721471

1473-
type cmdRes struct {
1474-
Config struct {
1475-
Directories struct {
1476-
Data string `json:"data"`
1477-
} `json:"directories"`
1478-
} `json:"config"`
1479-
}
1480-
var res cmdRes
1472+
var res string
14811473
if err := json.Unmarshal(cmdOutput.Bytes(), &res); err != nil {
14821474
return nil, errors.Errorf("parsing arduino-cli output: %s", err)
14831475
}
14841476
// Return only the build path
1485-
logger.Logf("Arduino Data Dir -> %s", res.Config.Directories.Data)
1486-
dataDir = res.Config.Directories.Data
1477+
logger.Logf("Arduino Data Dir -> %s", res)
1478+
dataDir = res
14871479
}
14881480

14891481
dataDirPath := paths.New(dataDir)

0 commit comments

Comments
 (0)