Skip to content

Commit 29454e4

Browse files
committedApr 5, 2018
Fixed tmp folder for core installation
1 parent b5e1a74 commit 29454e4

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed
 

‎cores/install_uninstall.go

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,13 @@ func InstallPlatform(destDir string, release *releases.DownloadResource) error {
6060
}
6161

6262
// Make a temp folder
63-
arduinoFolder, err := configs.ArduinoHomeFolder.Get()
63+
dataFolder, err := configs.ArduinoDataFolder.Get()
6464
if err != nil {
65-
return err
65+
return fmt.Errorf("getting data dir: %s", err)
6666
}
67-
tempFolder := filepath.Join(arduinoFolder, "tmp", "packages",
68-
fmt.Sprintf("platform-%d", time.Now().Unix()))
69-
err = os.MkdirAll(tempFolder, DirPermissions)
70-
if err != nil {
71-
return err
67+
tempFolder := filepath.Join(dataFolder, "tmp", fmt.Sprintf("platform-%d", time.Now().Unix()))
68+
if err = os.MkdirAll(tempFolder, DirPermissions); err != nil {
69+
return fmt.Errorf("creating temp dir for extraction: %s", err)
7270
}
7371
defer os.RemoveAll(tempFolder)
7472

@@ -129,12 +127,11 @@ func InstallTool(destToolsDir string, release *releases.DownloadResource) error
129127
}
130128

131129
// Make a temp folder
132-
arduinoFolder, err := configs.ArduinoHomeFolder.Get()
130+
dataFolder, err := configs.ArduinoDataFolder.Get()
133131
if err != nil {
134-
return err
132+
return fmt.Errorf("creating temp dir for extraction: %s", err)
135133
}
136-
tempFolder := filepath.Join(arduinoFolder, "tmp", "tools",
137-
fmt.Sprintf("tool-%d", time.Now().Unix()))
134+
tempFolder := filepath.Join(dataFolder, "tmp", fmt.Sprintf("tool-%d", time.Now().Unix()))
138135
err = os.MkdirAll(tempFolder, DirPermissions)
139136
if err != nil {
140137
return err

0 commit comments

Comments
 (0)
Please sign in to comment.