Skip to content

Commit

Permalink
Using BuiltInToolsDirs instead of ToolsDirs
Browse files Browse the repository at this point in the history
  • Loading branch information
cmaglie committed Sep 23, 2019
1 parent aa5bb45 commit 1b96a97
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/arduino/arduino-builder
go 1.12

require (
github.com/arduino/arduino-cli v0.0.0-20190909101745-b3db7a6400cf
github.com/arduino/arduino-cli v0.0.0-20190920124130-b6774033151c
github.com/arduino/go-paths-helper v0.0.0-20190214132331-c3c98d1bf2e1
github.com/arduino/go-properties-orderedmap v0.0.0-20190828172252-05018b28ff6c
github.com/go-errors/errors v1.0.1
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ github.com/arduino/arduino-cli v0.0.0-20190828173137-fffa451acd60 h1:5jnGjqzOYyS
github.com/arduino/arduino-cli v0.0.0-20190828173137-fffa451acd60/go.mod h1:mTVK2WsKc1Ehy2ic+rChPLo9N0uf3ZuUVO7C3y4Y04Q=
github.com/arduino/arduino-cli v0.0.0-20190909101745-b3db7a6400cf h1:MWVsGOfaT0/HzX5PP6/fWiPviu2YzBe1SbPMtX4qb7s=
github.com/arduino/arduino-cli v0.0.0-20190909101745-b3db7a6400cf/go.mod h1:mTVK2WsKc1Ehy2ic+rChPLo9N0uf3ZuUVO7C3y4Y04Q=
github.com/arduino/arduino-cli v0.0.0-20190920124130-b6774033151c h1:0ewBEBzUPbdJgXusSiofkoCJbrT2uKex5ZswdawmdAM=
github.com/arduino/arduino-cli v0.0.0-20190920124130-b6774033151c/go.mod h1:tGmlOZBUyZunMKW2TIwP/ztR2wnfL81+BNNuZaZmXuQ=
github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c h1:agh2JT96G8egU7FEb13L4dq3fnCN7lxXhJ86t69+W7s=
github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c/go.mod h1:HK7SpkEax/3P+0w78iRQx1sz1vCDYYw9RXwHjQTB5i8=
github.com/arduino/go-paths-helper v0.0.0-20190214132331-c3c98d1bf2e1 h1:S0NpDSqjlkNA510vmRCP5Cq9mPgu3rWDSdeN4SI1Mwc=
Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,9 @@ func main() {
if toolsFolders, err := toSliceOfUnquoted(toolsFoldersFlag); err != nil {
printCompleteError(err)
} else if len(toolsFolders) > 0 {
ctx.ToolsDirs = paths.NewPathList(toolsFolders...)
ctx.BuiltInToolsDirs = paths.NewPathList(toolsFolders...)
}
if len(ctx.ToolsDirs) == 0 {
if len(ctx.BuiltInToolsDirs) == 0 {
printErrorMessageAndFlagUsage(errors.New("Parameter '" + FLAG_TOOLS + "' is mandatory"))
}

Expand Down

0 comments on commit 1b96a97

Please sign in to comment.