crashreports are now created in .arduino-create/logs to preserve macos bundle integrity

Author: umbynos

main.go

@@ -24,7 +24,6 @@ import (
 	"io/ioutil"
 	"os"
 	"os/user"
-	"path/filepath"
 	"runtime"
 	"runtime/debug"
 	"strconv"
@@ -239,9 +238,10 @@ func loop() {
 
 	// Instantiate Tools
 	usr, _ := user.Current()
-	directory := filepath.Join(usr.HomeDir, ".arduino-create")
+	usrDir := paths.New(usr.HomeDir)
+	agentDir := usrDir.Join(".arduino-create")
 	Tools = tools.Tools{
-		Directory: directory,
+		Directory: agentDir.String(),
 		IndexURL:  *indexURL,
 		Logger: func(msg string) {
 			mapD := map[string]string{"DownloadStatus": "Pending", "Msg": msg}
@@ -331,16 +331,12 @@ func loop() {
 	// save crashreport to file
 	if *crashreport {
 		logFilename := "crashreport_" + time.Now().Format("20060102150405") + ".log"
-		currDir, err := os.Getwd()
-		if err != nil {
-			panic(err)
-		}
 		// handle logs directory creation
-		logsDir := filepath.Join(currDir, "logs")
-		if _, err := os.Stat(logsDir); os.IsNotExist(err) {
-			os.Mkdir(logsDir, 0700)
+		logsDir := agentDir.Join("logs")
+		if logsDir.NotExist() {
+			logsDir.Mkdir()
 		}
-		logFile, err := os.OpenFile(filepath.Join(logsDir, logFilename), os.O_WRONLY|os.O_CREATE|os.O_SYNC|os.O_APPEND, 0644)
+		logFile, err := os.OpenFile(logsDir.Join(logFilename).String(), os.O_WRONLY|os.O_CREATE|os.O_SYNC|os.O_APPEND, 0644)
 		if err != nil {
 			log.Print("Cannot create file used for crash-report")
 		} else {
@@ -399,7 +395,7 @@ func loop() {
 	r.POST("/update", updateHandler)
 
 	// Mount goa handlers
-	goa := v2.Server(directory)
+	goa := v2.Server(agentDir.String())
 	r.Any("/v2/*path", gin.WrapH(goa))
 
 	go func() {

systray/systray_real.go

@@ -22,11 +22,13 @@ package systray
 import (
 	"fmt"
 	"os"
+	"os/user"
 	"path/filepath"
 
 	log "github.com/sirupsen/logrus"
 
 	"github.com/arduino/arduino-create-agent/icon"
+	"github.com/arduino/go-paths-helper"
 	"github.com/getlantern/systray"
 	"github.com/go-ini/ini"
 	"github.com/skratchdot/open-golang/open"
@@ -101,32 +103,29 @@ func (s *Systray) updateMenuItem(item *systray.MenuItem, disable bool) {
 
 // CrashesIsEmpty checks if the folder containing crash-reports is empty
 func (s *Systray) CrashesIsEmpty() bool {
-	currDir, err := os.Getwd()
-	if err != nil {
-		log.Error("Cannot determine executable path: ", err)
-	}
-	logsDir := filepath.Join(currDir, "logs")
-	if _, err := os.Stat(string(logsDir)); os.IsNotExist(err) {
-		return true
-	}
-	return false
+	logsDir := getLogsDir()
+	return logsDir.NotExist() // if the logs directory is empty we assume there are no crashreports
 }
 
 // RemoveCrashes removes the crash-reports from `logs` folder
 func (s *Systray) RemoveCrashes() {
-	currDir, err := os.Getwd()
-	if err != nil {
-		log.Error("Cannot determine executable path: ", err)
-	}
-	logsDir := filepath.Join(currDir, "logs")
-	pathErr := os.RemoveAll(logsDir)
+	logsDir := getLogsDir()
+	pathErr := logsDir.RemoveAll()
 	if pathErr != nil {
-		log.Error("Cannot remove crashreports: ", pathErr)
+		log.Errorf("Cannot remove crashreports: %s", pathErr)
 	} else {
-		log.Info("Removed crashreports inside: ", logsDir)
+		log.Infof("Removed crashreports inside: %s", logsDir)
 	}
 }
 
+// getLogsDir simply returns the folder containing the logs
+func getLogsDir() *paths.Path {
+	usr, _ := user.Current()
+	usrDir := paths.New(usr.HomeDir) // The user folder, on linux/macos /home/<usr>/
+	agentDir := usrDir.Join(".arduino-create")
+	return agentDir.Join("logs")
+}
+
 // starthibernate creates a systray icon with menu options to resume/quit the agent
 func (s *Systray) startHibernate() {
 	systray.SetIcon(icon.GetIconHiber())
@@ -189,7 +188,7 @@ type configIni struct {
 // getconfigs parses all config files in the executable folder
 func getConfigs() []configIni {
 	// config.ini must be there, so call it Default
-	src, _ := os.Executable()
+	src, _ := os.Executable() // TODO change path
 	dest := filepath.Dir(src)
 
 	var configs []configIni