From ec9d3bb0882d8a909df382b7d58b53fd55d58aad Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Wed, 25 Sep 2019 13:06:01 +0200 Subject: [PATCH] builder: try to setup Sketch only when SketchLocation is provided --- legacy/builder/container_setup.go | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/legacy/builder/container_setup.go b/legacy/builder/container_setup.go index b5d5eef1fc0..01c5f655342 100644 --- a/legacy/builder/container_setup.go +++ b/legacy/builder/container_setup.go @@ -63,19 +63,21 @@ func (s *ContainerSetupHardwareToolsLibsSketchAndProps) Run(ctx *types.Context) } } - // get abs path to sketch - sketchLocation, err := ctx.SketchLocation.Abs() - if err != nil { - return i18n.WrapError(err) - } + if ctx.SketchLocation != nil { + // get abs path to sketch + sketchLocation, err := ctx.SketchLocation.Abs() + if err != nil { + return i18n.WrapError(err) + } - // load sketch - sketch, err := bldr.SketchLoad(sketchLocation.String(), ctx.BuildPath.String()) - if err != nil { - return i18n.WrapError(err) + // load sketch + sketch, err := bldr.SketchLoad(sketchLocation.String(), ctx.BuildPath.String()) + if err != nil { + return i18n.WrapError(err) + } + ctx.SketchLocation = paths.New(sketch.MainFile.Path) + ctx.Sketch = types.SketchToLegacy(sketch) } - ctx.SketchLocation = paths.New(sketch.MainFile.Path) - ctx.Sketch = types.SketchToLegacy(sketch) commands = []types.Command{ &SetupBuildProperties{},