Make the upload port parameter mandatory only when really needed

Author: cmaglie

commands/upload/upload.go

@@ -92,9 +92,6 @@ func runProgramAction(pm *packagemanager.PackageManager,
 			port = deviceURI.Host + deviceURI.Path
 		}
 	}
-	if port == "" {
-		return fmt.Errorf("no upload port provided")
-	}
 	logrus.WithField("port", port).Tracef("Upload port")
 
 	if fqbnIn == "" && sketch != nil && sketch.Metadata != nil {
@@ -266,6 +263,10 @@ func runProgramAction(pm *packagemanager.PackageManager,
 	if programmer == nil && !burnBootloader {
 		// Perform reset via 1200bps touch if requested
 		if uploadProperties.GetBoolean("upload.use_1200bps_touch") {
+			if port == "" {
+				return fmt.Errorf("no upload port provided")
+			}
+
 			ports, err := serial.GetPortsList()
 			if err != nil {
 				return fmt.Errorf("cannot get serial port list: %s", err)
@@ -310,12 +311,14 @@ func runProgramAction(pm *packagemanager.PackageManager,
 		}
 	}
 
-	// Set serial port property
-	uploadProperties.Set("serial.port", actualPort)
-	if strings.HasPrefix(actualPort, "/dev/") {
-		uploadProperties.Set("serial.port.file", actualPort[5:])
-	} else {
-		uploadProperties.Set("serial.port.file", actualPort)
+	if port != "" {
+		// Set serial port property
+		uploadProperties.Set("serial.port", actualPort)
+		if strings.HasPrefix(actualPort, "/dev/") {
+			uploadProperties.Set("serial.port.file", actualPort[5:])
+		} else {
+			uploadProperties.Set("serial.port.file", actualPort)
+		}
 	}
 
 	// Build recipe for upload
@@ -348,6 +351,9 @@ func runTool(recipeID string, props *properties.Map, outStream, errStream io.Wri
 	if strings.TrimSpace(recipe) == "" {
 		return nil // Nothing to run
 	}
+	if props.IsProertyMissingInExpandPropsInString("serial.port", recipe) {
+		return fmt.Errorf("no upload port provided")
+	}
 	cmdLine := props.ExpandPropsInString(recipe)
 	cmdArgs, err := properties.SplitQuotedString(cmdLine, `"'`, false)
 	if err != nil {

go.mod

@@ -6,7 +6,7 @@ require (
 	bou.ke/monkey v1.0.1
 	github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c
 	github.com/arduino/go-paths-helper v1.0.1
-	github.com/arduino/go-properties-orderedmap v1.0.0
+	github.com/arduino/go-properties-orderedmap v1.2.0
 	github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b
 	github.com/arduino/go-win32-utils v0.0.0-20180330194947-ed041402e83b
 	github.com/cmaglie/pb v1.0.27

go.sum

@@ -10,8 +10,8 @@ github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c h1:agh2JT9
 github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c/go.mod h1:HK7SpkEax/3P+0w78iRQx1sz1vCDYYw9RXwHjQTB5i8=
 github.com/arduino/go-paths-helper v1.0.1 h1:utYXLM2RfFlc9qp/MJTIYp3t6ux/xM6mWjeEb/WLK4Q=
 github.com/arduino/go-paths-helper v1.0.1/go.mod h1:HpxtKph+g238EJHq4geEPv9p+gl3v5YYu35Yb+w31Ck=
-github.com/arduino/go-properties-orderedmap v1.0.0 h1:caaM25TQZKkytoKQUsgqtOVbrM5i8Gb427JmW0KL05s=
-github.com/arduino/go-properties-orderedmap v1.0.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
+github.com/arduino/go-properties-orderedmap v1.2.0 h1:H7sub5hjAtFLZYd/NVWBOr6Jw7U1CnamYvNSM3dDdyE=
+github.com/arduino/go-properties-orderedmap v1.2.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
 github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b h1:9hDi4F2st6dbLC3y4i02zFT5quS4X6iioWifGlVwfy4=
 github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b/go.mod h1:uwGy5PpN4lqW97FiLnbcx+xx8jly5YuPMJWfVwwjJiQ=
 github.com/arduino/go-win32-utils v0.0.0-20180330194947-ed041402e83b h1:3PjgYG5gVPA7cipp7vIR2lF96KkEJIFBJ+ANnuv6J20=