Resource.Install: fail if no root folder is found in the archive

cmaglie · cmaglie · commit bcf7a7048225 · 2019-04-12T12:01:26.000+02:00
diff --git a/arduino/resources/install.go b/arduino/resources/install.go
@@ -123,5 +123,8 @@ func findPackageRoot(parent *paths.Path) (*paths.Path, error) {
 			return nil, fmt.Errorf("no unique root dir in archive, found '%s' and '%s'", root, file)
 		}
 	}
+	if root == nil {
+		return nil, fmt.Errorf("files in archive must be placed in a subdirectory")
+	}
 	return root, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -123,5 +123,8 @@ func findPackageRoot(parent paths.Path) (paths.Path, error) {`
`123`	`123`	`return nil, fmt.Errorf("no unique root dir in archive, found '%s' and '%s'", root, file)`
`124`	`124`	`}`
`125`	`125`	`}`
	`126`	`+ if root == nil {`
	`127`	`+ return nil, fmt.Errorf("files in archive must be placed in a subdirectory")`
	`128`	`+ }`
`126`	`129`	`return root, nil`
`127`	`130`	`}`