Commit 387188b

committed

builder: try to setup Sketch only when SketchLocation is provided

1 parent 2732f50 commit 387188bCopy full SHA for 387188b

File tree

+13

-11

lines changed

+13

-11

lines changed

Lines changed: 13 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,19 +63,21 @@ func (s ContainerSetupHardwareToolsLibsSketchAndProps) Run(ctx types.Context)`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`- // get abs path to sketch`
`67`		`- sketchLocation, err := ctx.SketchLocation.Abs()`
`68`		`- if err != nil {`
`69`		`- return i18n.WrapError(err)`
`70`		`- }`
	`66`	`+ if ctx.SketchLocation != nil {`
	`67`	`+ // get abs path to sketch`
	`68`	`+ sketchLocation, err := ctx.SketchLocation.Abs()`
	`69`	`+ if err != nil {`
	`70`	`+ return i18n.WrapError(err)`
	`71`	`+ }`
`71`	`72`
`72`		`- // load sketch`
`73`		`- sketch, err := bldr.SketchLoad(sketchLocation.String(), ctx.BuildPath.String())`
`74`		`- if err != nil {`
`75`		`- return i18n.WrapError(err)`
	`73`	`+ // load sketch`
	`74`	`+ sketch, err := bldr.SketchLoad(sketchLocation.String(), ctx.BuildPath.String())`
	`75`	`+ if err != nil {`
	`76`	`+ return i18n.WrapError(err)`
	`77`	`+ }`
	`78`	`+ ctx.SketchLocation = paths.New(sketch.MainFile.Path)`
	`79`	`+ ctx.Sketch = types.SketchToLegacy(sketch)`
`76`	`80`	`}`
`77`		`- ctx.SketchLocation = paths.New(sketch.MainFile.Path)`
`78`		`- ctx.Sketch = types.SketchToLegacy(sketch)`
`79`	`81`
`80`	`82`	`commands = []types.Command{`
`81`	`83`	`&SetupBuildProperties{},`

Comments

(0)