Removing some duplication by introducing

Federico Fissore · Federico Fissore · commit 3e0793be09ca · 2015-11-12T09:12:13.000+01:00
- utils.EnsureFolderExists
- utils.WriteFileBytes
- utils.WriteFile
- utils.TouchFile

Signed-off-by: Federico Fissore &lt;f.fissore@arduino.cc&gt;
diff --git a/main.go b/main.go
@@ -245,7 +245,7 @@ func main() {
 			return
 		}
 
-		err = os.MkdirAll(buildPath, os.FileMode(0755))
+		err = utils.EnsureFolderExists(buildPath)
 		if err != nil {
 			printCompleteError(err)
 			defer os.Exit(1)
diff --git a/src/arduino.cc/builder/additional_sketch_files_copier.go b/src/arduino.cc/builder/additional_sketch_files_copier.go
@@ -34,7 +34,6 @@ import (
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
 	"io/ioutil"
-	"os"
 	"path/filepath"
 )
 
@@ -44,7 +43,7 @@ func (s *AdditionalSketchFilesCopier) Run(context map[string]interface{}) error
 	sketch := context[constants.CTX_SKETCH].(*types.Sketch)
 	sketchBuildPath := context[constants.CTX_SKETCH_BUILD_PATH].(string)
 
-	err := os.MkdirAll(sketchBuildPath, os.FileMode(0755))
+	err := utils.EnsureFolderExists(sketchBuildPath)
 	if err != nil {
 		return utils.WrapError(err)
 	}
@@ -58,14 +57,17 @@ func (s *AdditionalSketchFilesCopier) Run(context map[string]interface{}) error
 		}
 
 		targetFilePath := filepath.Join(sketchBuildPath, relativePath)
-		os.MkdirAll(filepath.Dir(targetFilePath), os.FileMode(0755))
+		err = utils.EnsureFolderExists(filepath.Dir(targetFilePath))
+		if err != nil {
+			return utils.WrapError(err)
+		}
 
 		bytes, err := ioutil.ReadFile(file.Name)
 		if err != nil {
 			return utils.WrapError(err)
 		}
 
-		ioutil.WriteFile(targetFilePath, bytes, os.FileMode(0644))
+		utils.WriteFileBytes(targetFilePath, bytes)
 	}
 
 	return nil
diff --git a/src/arduino.cc/builder/builder_utils/utils.go b/src/arduino.cc/builder/builder_utils/utils.go
@@ -138,7 +138,7 @@ func compileFileWithRecipe(sourcePath string, source string, buildPath string, b
 	}
 	properties[constants.BUILD_PROPERTIES_OBJECT_FILE] = filepath.Join(buildPath, relativeSource+".o")
 
-	err = os.MkdirAll(filepath.Dir(properties[constants.BUILD_PROPERTIES_OBJECT_FILE]), os.FileMode(0755))
+	err = utils.EnsureFolderExists(filepath.Dir(properties[constants.BUILD_PROPERTIES_OBJECT_FILE]))
 	if err != nil {
 		return "", utils.WrapError(err)
 	}
diff --git a/src/arduino.cc/builder/coan_runner.go b/src/arduino.cc/builder/coan_runner.go
@@ -35,8 +35,6 @@ import (
 	"arduino.cc/builder/props"
 	"arduino.cc/builder/utils"
 	"fmt"
-	"io/ioutil"
-	"os"
 	"path/filepath"
 	"regexp"
 )
@@ -51,13 +49,13 @@ func (s *CoanRunner) Run(context map[string]interface{}) error {
 	verbose := context[constants.CTX_VERBOSE].(bool)
 
 	preprocPath := context[constants.CTX_PREPROC_PATH].(string)
-	err := os.MkdirAll(preprocPath, os.FileMode(0755))
+	err := utils.EnsureFolderExists(preprocPath)
 	if err != nil {
 		return utils.WrapError(err)
 	}
 
 	coanTargetFileName := filepath.Join(preprocPath, constants.FILE_COAN_TARGET)
-	err = ioutil.WriteFile(coanTargetFileName, []byte(source), os.FileMode(0644))
+	err = utils.WriteFile(coanTargetFileName, source)
 	if err != nil {
 		return utils.WrapError(err)
 	}
diff --git a/src/arduino.cc/builder/ctags_target_file_saver.go b/src/arduino.cc/builder/ctags_target_file_saver.go
@@ -32,8 +32,6 @@ package builder
 import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/utils"
-	"io/ioutil"
-	"os"
 	"path/filepath"
 )
 
@@ -46,13 +44,13 @@ func (s *CTagsTargetFileSaver) Run(context map[string]interface{}) error {
 	source := context[s.SourceField].(string)
 
 	preprocPath := context[constants.CTX_PREPROC_PATH].(string)
-	err := os.MkdirAll(preprocPath, os.FileMode(0755))
+	err := utils.EnsureFolderExists(preprocPath)
 	if err != nil {
 		return utils.WrapError(err)
 	}
 
 	ctagsTargetFileName := filepath.Join(preprocPath, s.Filename)
-	err = ioutil.WriteFile(ctagsTargetFileName, []byte(source), os.FileMode(0644))
+	err = utils.WriteFile(ctagsTargetFileName, source)
 	if err != nil {
 		return utils.WrapError(err)
 	}
diff --git a/src/arduino.cc/builder/ensure_buildpath_exists.go b/src/arduino.cc/builder/ensure_buildpath_exists.go
@@ -32,15 +32,14 @@ package builder
 import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/utils"
-	"os"
 )
 
 type EnsureBuildPathExists struct{}
 
 func (s *EnsureBuildPathExists) Run(context map[string]interface{}) error {
 	buildPath := context[constants.CTX_BUILD_PATH].(string)
 
-	err := os.MkdirAll(buildPath, os.FileMode(0755))
+	err := utils.EnsureFolderExists(buildPath)
 	if err != nil {
 		return utils.WrapError(err)
 	}
diff --git a/src/arduino.cc/builder/gcc_preproc_source_saver.go b/src/arduino.cc/builder/gcc_preproc_source_saver.go
@@ -32,22 +32,20 @@ package builder
 import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/utils"
-	"io/ioutil"
-	"os"
 	"path/filepath"
 )
 
 type GCCPreprocSourceSaver struct{}
 
 func (s *GCCPreprocSourceSaver) Run(context map[string]interface{}) error {
 	preprocPath := context[constants.CTX_PREPROC_PATH].(string)
-	err := os.MkdirAll(preprocPath, os.FileMode(0755))
+	err := utils.EnsureFolderExists(preprocPath)
 	if err != nil {
 		return utils.WrapError(err)
 	}
 
 	source := context[constants.CTX_SOURCE].(string)
 
-	err = ioutil.WriteFile(filepath.Join(preprocPath, constants.FILE_GCC_PREPROC_TARGET), []byte(source), os.FileMode(0644))
+	err = utils.WriteFile(filepath.Join(preprocPath, constants.FILE_GCC_PREPROC_TARGET), source)
 	return utils.WrapError(err)
 }
diff --git a/src/arduino.cc/builder/merge_sketch_with_bootloader.go b/src/arduino.cc/builder/merge_sketch_with_bootloader.go
@@ -34,7 +34,6 @@ import (
 	"arduino.cc/builder/i18n"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -101,5 +100,5 @@ func merge(builtSketchPath, bootloaderPath, mergedSketchPath string) error {
 		sketch = append(sketch, row)
 	}
 
-	return ioutil.WriteFile(mergedSketchPath, []byte(strings.Join(sketch, "\n")), os.FileMode(0644))
+	return utils.WriteFile(mergedSketchPath, strings.Join(sketch, "\n"))
 }
diff --git a/src/arduino.cc/builder/phases/core_builder.go b/src/arduino.cc/builder/phases/core_builder.go
@@ -34,7 +34,6 @@ import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
 	"arduino.cc/builder/utils"
-	"os"
 )
 
 type CoreBuilder struct{}
@@ -46,7 +45,7 @@ func (s *CoreBuilder) Run(context map[string]interface{}) error {
 	warningsLevel := context[constants.CTX_WARNINGS_LEVEL].(string)
 	logger := context[constants.CTX_LOGGER].(i18n.Logger)
 
-	err := os.MkdirAll(coreBuildPath, os.FileMode(0755))
+	err := utils.EnsureFolderExists(coreBuildPath)
 	if err != nil {
 		return utils.WrapError(err)
 	}
diff --git a/src/arduino.cc/builder/phases/libraries_builder.go b/src/arduino.cc/builder/phases/libraries_builder.go
@@ -51,7 +51,7 @@ func (s *LibrariesBuilder) Run(context map[string]interface{}) error {
 	warningsLevel := context[constants.CTX_WARNINGS_LEVEL].(string)
 	logger := context[constants.CTX_LOGGER].(i18n.Logger)
 
-	err := os.MkdirAll(librariesBuildPath, os.FileMode(0755))
+	err := utils.EnsureFolderExists(librariesBuildPath)
 	if err != nil {
 		return utils.WrapError(err)
 	}
@@ -83,7 +83,7 @@ func compileLibraries(libraries []*types.Library, buildPath string, buildPropert
 func compileLibrary(library *types.Library, buildPath string, buildProperties map[string]string, includes []string, verbose bool, warningsLevel string, logger i18n.Logger) ([]string, error) {
 	libraryBuildPath := filepath.Join(buildPath, library.Name)
 
-	err := os.MkdirAll(libraryBuildPath, os.FileMode(0755))
+	err := utils.EnsureFolderExists(libraryBuildPath)
 	if err != nil {
 		return nil, utils.WrapError(err)
 	}
diff --git a/src/arduino.cc/builder/phases/sketch_builder.go b/src/arduino.cc/builder/phases/sketch_builder.go
@@ -34,7 +34,6 @@ import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
 	"arduino.cc/builder/utils"
-	"os"
 )
 
 type SketchBuilder struct{}
@@ -48,7 +47,7 @@ func (s *SketchBuilder) Run(context map[string]interface{}) error {
 	warningsLevel := context[constants.CTX_WARNINGS_LEVEL].(string)
 	logger := context[constants.CTX_LOGGER].(i18n.Logger)
 
-	err := os.MkdirAll(sketchBuildPath, os.FileMode(0755))
+	err := utils.EnsureFolderExists(sketchBuildPath)
 	if err != nil {
 		return utils.WrapError(err)
 	}
diff --git a/src/arduino.cc/builder/sketch_saver.go b/src/arduino.cc/builder/sketch_saver.go
@@ -33,8 +33,6 @@ import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
-	"io/ioutil"
-	"os"
 	"path/filepath"
 )
 
@@ -45,11 +43,11 @@ func (s *SketchSaver) Run(context map[string]interface{}) error {
 	sketchBuildPath := context[constants.CTX_SKETCH_BUILD_PATH].(string)
 	source := context[constants.CTX_SOURCE].(string)
 
-	err := os.MkdirAll(sketchBuildPath, os.FileMode(0755))
+	err := utils.EnsureFolderExists(sketchBuildPath)
 	if err != nil {
 		return utils.WrapError(err)
 	}
 
-	err = ioutil.WriteFile(filepath.Join(sketchBuildPath, filepath.Base(sketch.MainFile.Name)+".cpp"), []byte(source), os.FileMode(0644))
+	err = utils.WriteFile(filepath.Join(sketchBuildPath, filepath.Base(sketch.MainFile.Name)+".cpp"), source)
 	return utils.WrapError(err)
 }
diff --git a/src/arduino.cc/builder/store_build_options_map.go b/src/arduino.cc/builder/store_build_options_map.go
@@ -31,8 +31,7 @@ package builder
 
 import (
 	"arduino.cc/builder/constants"
-	"io/ioutil"
-	"os"
+	"arduino.cc/builder/utils"
 	"path/filepath"
 )
 
@@ -42,7 +41,7 @@ func (s *StoreBuildOptionsMap) Run(context map[string]interface{}) error {
 	buildPath := context[constants.CTX_BUILD_PATH].(string)
 	buildOptionsJson := context[constants.CTX_BUILD_OPTIONS_JSON].(string)
 
-	ioutil.WriteFile(filepath.Join(buildPath, constants.BUILD_OPTIONS_FILE), []byte(buildOptionsJson), os.FileMode(0644))
+	utils.WriteFile(filepath.Join(buildPath, constants.BUILD_OPTIONS_FILE), buildOptionsJson)
 
 	return nil
 }
diff --git a/src/arduino.cc/builder/test/builder_utils_test.go b/src/arduino.cc/builder/test/builder_utils_test.go
@@ -31,6 +31,7 @@ package test
 
 import (
 	"arduino.cc/builder/builder_utils"
+	"arduino.cc/builder/utils"
 	"github.com/stretchr/testify/require"
 	"io/ioutil"
 	"os"
@@ -119,7 +120,7 @@ func TestObjFileIsUpToDateDepIsNewer(t *testing.T) {
 	headerFile := tempFile(t, "header")
 	defer os.RemoveAll(headerFile)
 
-	ioutil.WriteFile(depFile, []byte(objFile+": \\\n\t"+sourceFile+" \\\n\t"+headerFile), os.FileMode(0644))
+	utils.WriteFile(depFile, objFile+": \\\n\t"+sourceFile+" \\\n\t"+headerFile)
 
 	upToDate, err := builder_utils.ObjFileIsUpToDate(sourceFile, objFile, depFile)
 	NoError(t, err)
@@ -140,7 +141,7 @@ func TestObjFileIsUpToDateDepIsOlder(t *testing.T) {
 	depFile := tempFile(t, "dep")
 	defer os.RemoveAll(depFile)
 
-	ioutil.WriteFile(depFile, []byte(objFile+": \\\n\t"+sourceFile+" \\\n\t"+headerFile), os.FileMode(0644))
+	utils.WriteFile(depFile, objFile+": \\\n\t"+sourceFile+" \\\n\t"+headerFile)
 
 	upToDate, err := builder_utils.ObjFileIsUpToDate(sourceFile, objFile, depFile)
 	NoError(t, err)
@@ -163,7 +164,7 @@ func TestObjFileIsUpToDateDepIsWrong(t *testing.T) {
 	headerFile := tempFile(t, "header")
 	defer os.RemoveAll(headerFile)
 
-	ioutil.WriteFile(depFile, []byte(sourceFile+": \\\n\t"+sourceFile+" \\\n\t"+headerFile), os.FileMode(0644))
+	utils.WriteFile(depFile, sourceFile+": \\\n\t"+sourceFile+" \\\n\t"+headerFile)
 
 	upToDate, err := builder_utils.ObjFileIsUpToDate(sourceFile, objFile, depFile)
 	NoError(t, err)
diff --git a/src/arduino.cc/builder/test/helper_tools_downloader.go b/src/arduino.cc/builder/test/helper_tools_downloader.go
@@ -155,7 +155,7 @@ func patchFiles(t *testing.T) {
 			NoError(t, err)
 			operations, err := patchSet.Apply(ioutil.ReadFile)
 			for _, op := range operations {
-				ioutil.WriteFile(op.Dst, op.Data, os.FileMode(0644))
+				utils.WriteFileBytes(op.Dst, op.Data)
 			}
 		}
 	}
@@ -468,7 +468,7 @@ func downloadAndUnpackCore(core Core, url string, targetPath string) error {
 	}
 
 	if len(files) == 1 && files[0].IsDir() {
-		err = os.MkdirAll(filepath.Join(targetPath, core.Maintainer), os.FileMode(0755))
+		err = utils.EnsureFolderExists(filepath.Join(targetPath, core.Maintainer))
 		if err != nil {
 			return utils.WrapError(err)
 		}
@@ -477,7 +477,7 @@ func downloadAndUnpackCore(core Core, url string, targetPath string) error {
 			return utils.WrapError(err)
 		}
 	} else {
-		err = os.MkdirAll(filepath.Join(targetPath, core.Maintainer, core.Arch), os.FileMode(0755))
+		err = utils.EnsureFolderExists(filepath.Join(targetPath, core.Maintainer, core.Arch))
 		if err != nil {
 			return utils.WrapError(err)
 		}
@@ -517,7 +517,7 @@ func downloadAndUnpackBoardManagerCore(core Core, url string, targetPath string)
 	}
 
 	if len(files) == 1 && files[0].IsDir() {
-		err = os.MkdirAll(filepath.Join(targetPath, core.Maintainer, "hardware", core.Arch), os.FileMode(0755))
+		err = utils.EnsureFolderExists(filepath.Join(targetPath, core.Maintainer, "hardware", core.Arch))
 		if err != nil {
 			return utils.WrapError(err)
 		}
@@ -526,7 +526,7 @@ func downloadAndUnpackBoardManagerCore(core Core, url string, targetPath string)
 			return utils.WrapError(err)
 		}
 	} else {
-		err = os.MkdirAll(filepath.Join(targetPath, core.Maintainer, "hardware", core.Arch, core.Version), os.FileMode(0755))
+		err = utils.EnsureFolderExists(filepath.Join(targetPath, core.Maintainer, "hardware", core.Arch, core.Version))
 		if err != nil {
 			return utils.WrapError(err)
 		}
@@ -558,7 +558,7 @@ func downloadAndUnpackBoardsManagerTool(tool Tool, url string, targetPath string
 	defer os.RemoveAll(unpackFolder)
 
 	if len(files) == 1 && files[0].IsDir() {
-		err = os.MkdirAll(filepath.Join(targetPath, tool.Package, constants.FOLDER_TOOLS, tool.Name), os.FileMode(0755))
+		err = utils.EnsureFolderExists(filepath.Join(targetPath, tool.Package, constants.FOLDER_TOOLS, tool.Name))
 		if err != nil {
 			return utils.WrapError(err)
 		}
@@ -567,7 +567,7 @@ func downloadAndUnpackBoardsManagerTool(tool Tool, url string, targetPath string
 			return utils.WrapError(err)
 		}
 	} else {
-		err = os.MkdirAll(filepath.Join(targetPath, tool.Package, constants.FOLDER_TOOLS, tool.Name, tool.Version), os.FileMode(0755))
+		err = utils.EnsureFolderExists(filepath.Join(targetPath, tool.Package, constants.FOLDER_TOOLS, tool.Name, tool.Version))
 		if err != nil {
 			return utils.WrapError(err)
 		}
@@ -609,7 +609,7 @@ func downloadAndUnpackTool(tool Tool, url string, targetPath string, deleteIfMis
 	}
 
 	if len(files) == 1 && files[0].IsDir() {
-		err = os.MkdirAll(filepath.Join(targetPath, tool.Name), os.FileMode(0755))
+		err = utils.EnsureFolderExists(filepath.Join(targetPath, tool.Name))
 		if err != nil {
 			return utils.WrapError(err)
 		}
@@ -618,7 +618,7 @@ func downloadAndUnpackTool(tool Tool, url string, targetPath string, deleteIfMis
 			return utils.WrapError(err)
 		}
 	} else {
-		err = os.MkdirAll(filepath.Join(targetPath, tool.Name, tool.Version), os.FileMode(0755))
+		err = utils.EnsureFolderExists(filepath.Join(targetPath, tool.Name, tool.Version))
 		if err != nil {
 			return utils.WrapError(err)
 		}
@@ -656,7 +656,7 @@ func downloadAndUnpack(url string) (string, []os.FileInfo, error) {
 	}
 	res.Body.Close()
 
-	ioutil.WriteFile(archiveFilePath, bytes, os.FileMode(0644))
+	utils.WriteFileBytes(archiveFilePath, bytes)
 
 	cmd := buildUnpackCmd(archiveFilePath)
 	out, err := cmd.CombinedOutput()
diff --git a/src/arduino.cc/builder/test/load_previous_build_options_map_test.go b/src/arduino.cc/builder/test/load_previous_build_options_map_test.go
@@ -34,7 +34,6 @@ import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/utils"
 	"github.com/stretchr/testify/require"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -46,7 +45,7 @@ func TestLoadPreviousBuildOptionsMap(t *testing.T) {
 	buildPath := SetupBuildPath(t, context)
 	defer os.RemoveAll(buildPath)
 
-	err := ioutil.WriteFile(filepath.Join(buildPath, constants.BUILD_OPTIONS_FILE), []byte("test"), os.FileMode(0644))
+	err := utils.WriteFile(filepath.Join(buildPath, constants.BUILD_OPTIONS_FILE), "test")
 	NoError(t, err)
 
 	command := builder.LoadPreviousBuildOptionsMap{}
diff --git a/src/arduino.cc/builder/test/merge_sketch_with_bootloader_test.go b/src/arduino.cc/builder/test/merge_sketch_with_bootloader_test.go
diff --git a/src/arduino.cc/builder/test/wipeout_build_path_if_build_options_changed_test.go b/src/arduino.cc/builder/test/wipeout_build_path_if_build_options_changed_test.go
diff --git a/src/arduino.cc/builder/utils/utils.go b/src/arduino.cc/builder/utils/utils.go

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ func main() {`
`245`	`245`	`return`
`246`	`246`	`}`
`247`	`247`
`248`		`- err = os.MkdirAll(buildPath, os.FileMode(0755))`
	`248`	`+ err = utils.EnsureFolderExists(buildPath)`
`249`	`249`	`if err != nil {`
`250`	`250`	`printCompleteError(err)`
`251`	`251`	`defer os.Exit(1)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ import (`
`34`	`34`	`"arduino.cc/builder/types"`
`35`	`35`	`"arduino.cc/builder/utils"`
`36`	`36`	`"io/ioutil"`
`37`		`- "os"`
`38`	`37`	`"path/filepath"`
`39`	`38`	`)`
`40`	`39`
`@@ -44,7 +43,7 @@ func (s *AdditionalSketchFilesCopier) Run(context map[string]interface{}) error`
`44`	`43`	`sketch := context[constants.CTX_SKETCH].(*types.Sketch)`
`45`	`44`	`sketchBuildPath := context[constants.CTX_SKETCH_BUILD_PATH].(string)`
`46`	`45`
`47`		`- err := os.MkdirAll(sketchBuildPath, os.FileMode(0755))`
	`46`	`+ err := utils.EnsureFolderExists(sketchBuildPath)`
`48`	`47`	`if err != nil {`
`49`	`48`	`return utils.WrapError(err)`
`50`	`49`	`}`
`@@ -58,14 +57,17 @@ func (s *AdditionalSketchFilesCopier) Run(context map[string]interface{}) error`
`58`	`57`	`}`
`59`	`58`
`60`	`59`	`targetFilePath := filepath.Join(sketchBuildPath, relativePath)`
`61`		`- os.MkdirAll(filepath.Dir(targetFilePath), os.FileMode(0755))`
	`60`	`+ err = utils.EnsureFolderExists(filepath.Dir(targetFilePath))`
	`61`	`+ if err != nil {`
	`62`	`+ return utils.WrapError(err)`
	`63`	`+ }`
`62`	`64`
`63`	`65`	`bytes, err := ioutil.ReadFile(file.Name)`
`64`	`66`	`if err != nil {`
`65`	`67`	`return utils.WrapError(err)`
`66`	`68`	`}`
`67`	`69`
`68`		`- ioutil.WriteFile(targetFilePath, bytes, os.FileMode(0644))`
	`70`	`+ utils.WriteFileBytes(targetFilePath, bytes)`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ func compileFileWithRecipe(sourcePath string, source string, buildPath string, b`
`138`	`138`	`}`
`139`	`139`	`properties[constants.BUILD_PROPERTIES_OBJECT_FILE] = filepath.Join(buildPath, relativeSource+".o")`
`140`	`140`
`141`		`- err = os.MkdirAll(filepath.Dir(properties[constants.BUILD_PROPERTIES_OBJECT_FILE]), os.FileMode(0755))`
	`141`	`+ err = utils.EnsureFolderExists(filepath.Dir(properties[constants.BUILD_PROPERTIES_OBJECT_FILE]))`
`142`	`142`	`if err != nil {`
`143`	`143`	`return "", utils.WrapError(err)`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,15 +32,14 @@ package builder`
`32`	`32`	`import (`
`33`	`33`	`"arduino.cc/builder/constants"`
`34`	`34`	`"arduino.cc/builder/utils"`
`35`		`- "os"`
`36`	`35`	`)`
`37`	`36`
`38`	`37`	`type EnsureBuildPathExists struct{}`
`39`	`38`
`40`	`39`	`func (s *EnsureBuildPathExists) Run(context map[string]interface{}) error {`
`41`	`40`	`buildPath := context[constants.CTX_BUILD_PATH].(string)`
`42`	`41`
`43`		`- err := os.MkdirAll(buildPath, os.FileMode(0755))`
	`42`	`+ err := utils.EnsureFolderExists(buildPath)`
`44`	`43`	`if err != nil {`
`45`	`44`	`return utils.WrapError(err)`
`46`	`45`	`}`