properly clean-up temp files. /tmp/fwuploader was removed in the wr…

…ong place
arduino · Jun 14, 2023 · 2631352 · 2631352
1 parent 858912a
commit 2631352
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/cli/certificates/flash.go b/cli/certificates/flash.go
@@ -28,6 +28,7 @@ import (
 	"github.com/arduino/arduino-fwuploader/cli/arguments"
 	"github.com/arduino/arduino-fwuploader/cli/common"
 	"github.com/arduino/arduino-fwuploader/cli/feedback"
+	"github.com/arduino/arduino-fwuploader/cli/globals"
 	"github.com/arduino/arduino-fwuploader/flasher"
 	"github.com/arduino/arduino-fwuploader/indexes/download"
 	"github.com/arduino/go-paths-helper"
@@ -61,6 +62,8 @@ func NewFlashCommand() *cobra.Command {
 }
 
 func runFlash(cmd *cobra.Command, args []string) {
+	// at the end cleanup the fwuploader temp dir
+	defer globals.FwUploaderPath.RemoveAll()
 
 	packageIndex, firmwareIndex := common.InitIndexes()
 	common.CheckFlags(commonFlags.Fqbn, commonFlags.Address)

diff --git a/cli/firmware/flash.go b/cli/firmware/flash.go
@@ -28,6 +28,7 @@ import (
 	"github.com/arduino/arduino-fwuploader/cli/arguments"
 	"github.com/arduino/arduino-fwuploader/cli/common"
 	"github.com/arduino/arduino-fwuploader/cli/feedback"
+	"github.com/arduino/arduino-fwuploader/cli/globals"
 	"github.com/arduino/arduino-fwuploader/flasher"
 	"github.com/arduino/arduino-fwuploader/indexes/download"
 	"github.com/arduino/arduino-fwuploader/indexes/firmwareindex"
@@ -65,6 +66,8 @@ func NewFlashCommand() *cobra.Command {
 }
 
 func runFlash(cmd *cobra.Command, args []string) {
+	// at the end cleanup the fwuploader temp dir
+	defer globals.FwUploaderPath.RemoveAll()
 
 	packageIndex, firmwareIndex := common.InitIndexes()
 	common.CheckFlags(commonFlags.Fqbn, commonFlags.Address)

diff --git a/cli/firmware/getversion.go b/cli/firmware/getversion.go
@@ -27,6 +27,7 @@ import (
 
 	"github.com/arduino/arduino-fwuploader/cli/common"
 	"github.com/arduino/arduino-fwuploader/cli/feedback"
+	"github.com/arduino/arduino-fwuploader/cli/globals"
 	"github.com/arduino/arduino-fwuploader/flasher"
 	"github.com/arduino/arduino-fwuploader/indexes/download"
 	"github.com/arduino/arduino-fwuploader/indexes/firmwareindex"
@@ -53,6 +54,8 @@ func NewGetVersionCommand() *cobra.Command {
 }
 
 func runGetVersion(cmd *cobra.Command, args []string) {
+	// at the end cleanup the fwuploader temp dir
+	defer globals.FwUploaderPath.RemoveAll()
 
 	packageIndex, firmwareIndex := common.InitIndexes()
 	common.CheckFlags(commonFlags.Fqbn, commonFlags.Address)

diff --git a/indexes/download/download.go b/indexes/download/download.go
@@ -59,6 +59,7 @@ func DownloadTool(toolRelease *cores.ToolRelease) (*paths.Path, error) {
 		logrus.Error(err)
 		return nil, err
 	}
+	defer downloadsDir.RemoveAll()
 	d, err := downloader.Download(archivePath.String(), resource.URL, downloader.NoResume)
 	if err != nil {
 		logrus.Error(err)

diff --git a/indexes/indexes.go b/indexes/indexes.go
@@ -89,7 +89,6 @@ func GetPackageIndex() (*packageindex.Index, error) {
 
 // GetFirmwareIndex downloads and loads the arduino-fwuploader module_firmware_index.json
 func GetFirmwareIndex() (*firmwareindex.Index, error) {
-	defer globals.FwUploaderPath.RemoveAll()
 	indexPath, err := download.DownloadIndex(globals.ModuleFirmwareIndexGZURL)
 	if err != nil {
 		logrus.Error(err)

diff --git a/indexes/indexes_test.go b/indexes/indexes_test.go
@@ -22,7 +22,6 @@ import (
 	"testing"
 
 	"github.com/arduino/arduino-cli/arduino/cores/packageindex"
-	"github.com/arduino/arduino-fwuploader/cli/globals"
 	"github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/require"
 )
@@ -48,5 +47,4 @@ func TestGetFirmwareIndex(t *testing.T) {
 	index, err := GetFirmwareIndex()
 	require.NoError(t, err)
 	require.NotNil(t, index)
-	require.NoDirExists(t, globals.FwUploaderPath.String())
 }