bump github.com/arduino/go-paths-helper to v1.9.2

alessio-perugini · alessio-perugini · commit 64a0d242d228 · 2023-10-02T14:44:35.000+02:00
diff --git a/.licenses/go/github.com/arduino/go-paths-helper.dep.yml b/.licenses/go/github.com/arduino/go-paths-helper.dep.yml
@@ -1,8 +1,8 @@
 ---
 name: github.com/arduino/go-paths-helper
-version: v1.9.0
+version: v1.9.2
 type: go
-summary:
+summary: 
 homepage: https://pkg.go.dev/github.com/arduino/go-paths-helper
 license: gpl-2.0-or-later
 licenses:
diff --git a/arduino/cores/packagemanager/install_uninstall.go b/arduino/cores/packagemanager/install_uninstall.go
@@ -266,7 +266,7 @@ func (pme *Explorer) IsManagedPlatformRelease(platformRelease *cores.PlatformRel
 	if packagesDir.FollowSymLink() != nil {
 		return false
 	}
-	managed := installDir.IsInsideDir(packagesDir)
+	managed, _ := installDir.IsInsideDir(packagesDir)
 	return managed
 }
 
@@ -383,7 +383,7 @@ func (pme *Explorer) IsManagedToolRelease(toolRelease *cores.ToolRelease) bool {
 	if packagesDir.FollowSymLink() != nil {
 		return false
 	}
-	managed := installDir.IsInsideDir(packagesDir)
+	managed, _ := installDir.IsInsideDir(packagesDir)
 	return managed
 }
 
diff --git a/arduino/sketch/sketch.go b/arduino/sketch/sketch.go
@@ -135,7 +135,7 @@ func New(path *paths.Path) (*Sketch, error) {
 		} else if globals.AdditionalFileValidExtensions[ext] {
 			// If the user exported the compiles binaries to the Sketch "build" folder
 			// they would be picked up but we don't want them, so we skip them like so
-			if p.IsInsideDir(sketch.FullPath.Join("build")) {
+			if ok, _ := p.IsInsideDir(sketch.FullPath.Join("build")); ok {
 				continue
 			}
 
diff --git a/commands/compile/compile.go b/commands/compile/compile.go
@@ -135,7 +135,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 	var buildPath *paths.Path
 	if buildPathArg := req.GetBuildPath(); buildPathArg != "" {
 		buildPath = paths.New(req.GetBuildPath()).Canonical()
-		if in := buildPath.IsInsideDir(sk.FullPath); in && buildPath.IsDir() {
+		if in, _ := buildPath.IsInsideDir(sk.FullPath); in && buildPath.IsDir() {
 			if sk.AdditionalFiles, err = removeBuildFromSketchFiles(sk.AdditionalFiles, buildPath); err != nil {
 				return nil, err
 			}
@@ -377,7 +377,7 @@ func removeBuildFromSketchFiles(files paths.PathList, build *paths.Path) (paths.
 	var res paths.PathList
 	ignored := false
 	for _, file := range files {
-		if !file.IsInsideDir(build) {
+		if isInside, _ := file.IsInsideDir(build); !isInside {
 			res = append(res, file)
 		} else if !ignored {
 			ignored = true
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ replace github.com/mailru/easyjson => github.com/cmaglie/easyjson v0.8.1
 
 require (
 	github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371
-	github.com/arduino/go-paths-helper v1.9.0
+	github.com/arduino/go-paths-helper v1.9.2
 	github.com/arduino/go-properties-orderedmap v1.7.2
 	github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b
 	github.com/arduino/go-win32-utils v1.0.0
diff --git a/go.sum b/go.sum
@@ -51,8 +51,8 @@ github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/arduino/go-paths-helper v1.0.1/go.mod h1:HpxtKph+g238EJHq4geEPv9p+gl3v5YYu35Yb+w31Ck=
-github.com/arduino/go-paths-helper v1.9.0 h1:IjWhDSF24n5bK/30NyApmzoVH9brWzc52KNPpBsRmMc=
-github.com/arduino/go-paths-helper v1.9.0/go.mod h1:V82BWgAAp4IbmlybxQdk9Bpkz8M4Qyx+RAFKaG9NuvU=
+github.com/arduino/go-paths-helper v1.9.2 h1:omR8DPTL4nbUCWfGey5D+e3WvWfA2zEgoM6ZBRNt7ls=
+github.com/arduino/go-paths-helper v1.9.2/go.mod h1:V82BWgAAp4IbmlybxQdk9Bpkz8M4Qyx+RAFKaG9NuvU=
 github.com/arduino/go-properties-orderedmap v1.7.2 h1:WwVEtlbwYmESUnOuKVm4rwJg3NHrQ/wVSbtkk4z62SY=
 github.com/arduino/go-properties-orderedmap v1.7.2/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
 github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b h1:9hDi4F2st6dbLC3y4i02zFT5quS4X6iioWifGlVwfy4=

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ func (pme Explorer) IsManagedPlatformRelease(platformRelease cores.PlatformRel`
`266`	`266`	`if packagesDir.FollowSymLink() != nil {`
`267`	`267`	`return false`
`268`	`268`	`}`
`269`		`- managed := installDir.IsInsideDir(packagesDir)`
	`269`	`+ managed, _ := installDir.IsInsideDir(packagesDir)`
`270`	`270`	`return managed`
`271`	`271`	`}`
`272`	`272`
`@@ -383,7 +383,7 @@ func (pme Explorer) IsManagedToolRelease(toolRelease cores.ToolRelease) bool {`
`383`	`383`	`if packagesDir.FollowSymLink() != nil {`
`384`	`384`	`return false`
`385`	`385`	`}`
`386`		`- managed := installDir.IsInsideDir(packagesDir)`
	`386`	`+ managed, _ := installDir.IsInsideDir(packagesDir)`
`387`	`387`	`return managed`
`388`	`388`	`}`
`389`	`389`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ func New(path paths.Path) (Sketch, error) {`
`135`	`135`	`} else if globals.AdditionalFileValidExtensions[ext] {`
`136`	`136`	`// If the user exported the compiles binaries to the Sketch "build" folder`
`137`	`137`	`// they would be picked up but we don't want them, so we skip them like so`
`138`		`- if p.IsInsideDir(sketch.FullPath.Join("build")) {`
	`138`	`+ if ok, _ := p.IsInsideDir(sketch.FullPath.Join("build")); ok {`
`139`	`139`	`continue`
`140`	`140`	`}`
`141`	`141`