Fix permission problems while unzipping

arduino · Jan 11, 2018 · e3a3096 · e3a3096
1 parent b3dd26f
commit e3a3096
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/sketch_loader.go b/sketch_loader.go
@@ -69,7 +69,7 @@ func (s *SketchLoader) Run(ctx *types.Context) error {
 		dir, _ := ioutil.TempDir("", "arduino_sketch_zip_temp")
 		sketchLocation, err = utils.ExtractZip(sketchLocation, dir)
 		if err != nil {
-			return nil
+			panic(err)
 		}
 		mainSketchFileName := filepath.Base(sketchLocation) + ".ino"
 		sketchLocation = filepath.Join(sketchLocation, mainSketchFileName)

diff --git a/utils/utils.go b/utils/utils.go
@@ -508,9 +508,12 @@ func ExtractZip(filePath string, location string) (string, error) {
 	for _, f := range r.File {
 		fullname := filepath.Join(location, strings.Replace(f.Name, "", "", -1))
 		if f.FileInfo().IsDir() {
-			os.MkdirAll(fullname, f.FileInfo().Mode().Perm())
+			os.MkdirAll(fullname, 0755)
 		} else {
-			os.MkdirAll(filepath.Dir(fullname), 0755)
+			_, err := os.Stat(filepath.Dir(fullname))
+			if err != nil {
+				os.MkdirAll(filepath.Dir(fullname), 0755)
+			}
 			perms := f.FileInfo().Mode().Perm()
 			out, err := os.OpenFile(fullname, os.O_CREATE|os.O_RDWR, perms)
 			if err != nil {