fixed conflicts in main

Author: matteosuppo

main.go

@@ -6,19 +6,15 @@ package main
 import (
 	"flag"
 	"os"
-	"os/user"
 	"path/filepath"
 	"runtime/debug"
 	"strconv"
 	"text/template"
 	"time"
 
 	log "github.com/Sirupsen/logrus"
-<<<<<<< e73846650fde9b0955aa35e237100ec552af47fb
-=======
+
 	"github.com/arduino/arduino-create-agent/tools"
-	"github.com/carlescere/scheduler"
->>>>>>> Move initialization of tools in package tools
 	"github.com/gin-gonic/gin"
 	"github.com/itsjamie/gin-cors"
 	"github.com/kardianos/osext"
@@ -39,16 +35,15 @@ var (
 	gcType       = flag.String("gc", "std", "Type of garbage collection. std = Normal garbage collection allowing system to decide (this has been known to cause a stop the world in the middle of a CNC job which can cause lost responses from the CNC controller and thus stalled jobs. use max instead to solve.), off = let memory grow unbounded (you have to send in the gc command manually to garbage collect or you will run out of RAM eventually), max = Force garbage collection on each recv or send on a serial port (this minimizes stop the world events and thus lost serial responses, but increases CPU usage)")
 	logDump      = flag.String("log", "off", "off = (default)")
 	// hostname. allow user to override, otherwise we look it up
-	hostname  = flag.String("hostname", "unknown-hostname", "Override the hostname we get from the OS")
-	updateUrl = flag.String("updateUrl", "", "")
-	appName   = flag.String("appName", "", "")
-	genCert   = flag.Bool("generateCert", false, "")
-	port      string
-	portSSL   string
-	origins   = flag.String("origins", "", "Allowed origin list for CORS")
-	address   = flag.String("address", "127.0.0.1", "The address where to listen. Defaults to localhost")
-	indexURL  = flag.String("indexURL", "http://downloads.arduino.cc/packages/package_index.json", "The address from where to download the index json containing the location of upload tools")
-	Tools     tools.Tools
+	hostname       = flag.String("hostname", "unknown-hostname", "Override the hostname we get from the OS")
+	updateUrl      = flag.String("updateUrl", "", "")
+	appName        = flag.String("appName", "", "")
+	genCert        = flag.Bool("generateCert", false, "")
+	globalToolsMap = make(map[string]string)
+	port           string
+	portSSL        string
+	origins        = flag.String("origins", "", "Allowed origin list for CORS")
+	address        = flag.String("address", "127.0.0.1", "The address where to listen. Defaults to localhost")
 )
 
 type NullWriter int
@@ -91,15 +86,7 @@ func main() {
 			src, _ := osext.Executable()
 			dest := filepath.Dir(src)
 
-			// Instantiate Tools
-			usr, _ := user.Current()
-			directory := usr.HomeDir + "/.arduino-create"
-			Tools = tools.Tools{
-				Directory: directory,
-				IndexURL:  *indexURL,
-				Logger:    log.New(),
-			}
-			Tools.Init()
+			tools.CreateDir()
 
 			if embedded_autoextract {
 				// save the config.ini (if it exists)