Fix {serial.port} being resolved too early

Author: facchinm

conn.go

@@ -130,7 +130,7 @@ func uploadHandler(c *gin.Context) {
 
 	go func() {
 		// Resolve commandline
-		commandline, err := upload.Resolve(data.Port, data.Board, filePath, data.Commandline, data.Extra, &Tools)
+		commandline, err := upload.PartiallyResolve(data.Board, filePath, data.Commandline, data.Extra, &Tools)
 		if err != nil {
 			send(map[string]string{uploadStatusStr: "Error", "Msg": err.Error()})
 			return

tools/download.go

@@ -126,6 +126,17 @@ func (t *Tools) DownloadPackageIndex(index_file, signature_file string) error {
 	return nil
 }
 
+func pathExists(path string) bool {
+	_, err := os.Stat(path)
+	if err == nil {
+		return true
+	}
+	if os.IsNotExist(err) {
+		return false
+	}
+	return true
+}
+
 // Download will parse the index at the indexURL for the tool to download.
 // It will extract it in a folder in .arduino-create, and it will update the
 // Installed map.
@@ -181,7 +192,8 @@ func (t *Tools) Download(pack, name, version, behaviour string) error {
 
 	// Check if it already exists
 	if behaviour == "keep" {
-		if _, ok := t.installed[key]; ok {
+		location, ok := t.installed[key]
+		if ok && pathExists(location) {
 			t.Logger.Println("The tool is already present on the system")
 			return nil
 		}

upload/upload.go

@@ -43,13 +43,11 @@ type Extra struct {
 	ParamsQuiet       string `json:"params_quiet"`
 }
 
-// Resolve replaces some symbols in the commandline with the appropriate values
+// PartiallyResolve replaces some symbols in the commandline with the appropriate values
 // it can return an error when looking a variable in the Locater
-func Resolve(port, board, file, commandline string, extra Extra, t Locater) (string, error) {
+func PartiallyResolve(board, file, commandline string, extra Extra, t Locater) (string, error) {
 	commandline = strings.Replace(commandline, "{build.path}", filepath.ToSlash(filepath.Dir(file)), -1)
 	commandline = strings.Replace(commandline, "{build.project_name}", strings.TrimSuffix(filepath.Base(file), filepath.Ext(filepath.Base(file))), -1)
-	commandline = strings.Replace(commandline, "{serial.port}", port, -1)
-	commandline = strings.Replace(commandline, "{serial.port.file}", filepath.Base(port), -1)
 
 	if extra.Verbose == true {
 		commandline = strings.Replace(commandline, "{upload.verbose}", extra.ParamsVerbose, -1)
@@ -67,12 +65,20 @@ func Resolve(port, board, file, commandline string, extra Extra, t Locater) (str
 		if err != nil {
 			return "", errors.Wrapf(err, "get location of %s", element)
 		}
-		commandline = strings.Replace(commandline, element, location, 1)
+		if location != "" {
+			commandline = strings.Replace(commandline, element, location, 1)
+		}
 	}
 
 	return commandline, nil
 }
 
+func fixupPort(port, commandline string) string {
+	commandline = strings.Replace(commandline, "{serial.port}", port, -1)
+	commandline = strings.Replace(commandline, "{serial.port.file}", filepath.Base(port), -1)
+	return commandline
+}
+
 // Network performs a network upload
 func Network(port, board, file, commandline string, auth Auth, l Logger) error {
 	Busy = true
@@ -85,6 +91,8 @@ func Network(port, board, file, commandline string, auth Auth, l Logger) error {
 		auth.Password = "arduino"
 	}
 
+	commandline = fixupPort(port, commandline)
+
 	// try with a form
 	err := form(port, board, file, auth, l)
 	if err != nil {
@@ -110,6 +118,8 @@ func Serial(port, commandline string, extra Extra, l Logger) error {
 		}
 	}
 
+	commandline = fixupPort(port, commandline)
+
 	z, err := shellwords.Parse(commandline)
 	if err != nil {
 		return errors.Wrapf(err, "Parse commandline")