Remove debug log, update binaries

Author: facchinm

distrib/linux32/bin/arduinoOTA

@@ -7,23 +7,27 @@ import (
 	"io"
 	"io/ioutil"
 	"net/http"
-	"net/http/httputil"
 	"os"
 	"regexp"
 	"strconv"
 	"strings"
 	"time"
 )
 
+const AppVersion = "1.0.0"
+
+var compileInfo string
+
 var (
+	version        = flag.Bool("version", false, "Prints program version")
 	networkAddress = flag.String("address", "localhost", "The address of the board")
 	networkPort    = flag.String("port", "80", "The board needs to be listening on this port")
 	sketchPath     = flag.String("sketch", "", "Sketch path")
 	uploadEndpoint = flag.String("upload", "", "Upload endpoint")
 	resetEndpoint  = flag.String("reset", "", "Upload endpoint")
 	syncEndpoint   = flag.String("sync", "", "Upload endpoint")
-	verbose        = flag.String("v", "true", "Verbose flag")
-	quiet          = flag.String("q", "", "Quiet flag")
+	verbose        = flag.Bool("v", true, "Verbose flag")
+	quiet          = flag.Bool("q", false, "Quiet flag")
 	useSsl         = flag.String("ssl", "", "SSL flag")
 	syncRet        = flag.String("sync_exp", "", "sync expected return code in format code:string")
 )
@@ -36,6 +40,11 @@ type Item struct {
 func main() {
 	flag.Parse()
 
+	if *version {
+		fmt.Println(AppVersion + compileInfo)
+		os.Exit(0)
+	}
+
 	httpheader := "http://"
 
 	if *useSsl != "" {
@@ -54,15 +63,13 @@ func main() {
 	}
 
 	if *syncEndpoint != "" {
-		if *verbose != "" {
+		if *verbose {
 			fmt.Println("Resetting the board")
 		}
 
 		resp, err := http.Post(httpheader+*networkAddress+":"+*networkPort+*syncEndpoint, "", nil)
-		fmt.Println(resp.StatusCode)
-		fmt.Println(resp.Status)
 		if err != nil || resp.StatusCode != syncRetCode {
-			if *verbose != "" {
+			if *verbose {
 				fmt.Println("Failed to reset the board, upload failed")
 			}
 			os.Exit(1)
@@ -71,7 +78,7 @@ func main() {
 	}
 
 	if *syncEndpoint != "" {
-		if *verbose != "" {
+		if *verbose {
 			fmt.Println("Waiting for the upload to start")
 		}
 
@@ -80,7 +87,7 @@ func main() {
 		for timeout < 10 {
 			resp, err := http.Get(httpheader + *networkAddress + ":" + *networkPort + *syncEndpoint)
 			if err != nil {
-				if *verbose != "" {
+				if *verbose {
 					fmt.Println("Failed to reset the board, upload failed")
 				}
 				os.Exit(1)
@@ -100,13 +107,13 @@ func main() {
 	}
 
 	if *uploadEndpoint != "" {
-		if *verbose != "" {
+		if *verbose {
 			fmt.Println("Uploading the sketch")
 		}
 
 		f, err := os.Open(*sketchPath)
 		if err != nil {
-			if *verbose != "" {
+			if *verbose {
 				fmt.Println("Failed to open the sketch")
 			}
 			os.Exit(1)
@@ -119,19 +126,16 @@ func main() {
 
 		req, err := http.NewRequest("POST", httpheader+*networkAddress+":"+*networkPort+*uploadEndpoint, bytes.NewBufferString(str))
 		if err != nil {
-			if *verbose != "" {
+			if *verbose {
 				fmt.Println("Error sending sketch file")
 			}
 			os.Exit(1)
 		}
 		req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 
-		aaa, _ := httputil.DumpRequestOut(req, true)
-		fmt.Println(string(aaa))
-
 		resp, err := http.DefaultClient.Do(req)
 		if err != nil {
-			if *verbose != "" {
+			if *verbose {
 				fmt.Println("Error flashing the sketch")
 			}
 			os.Exit(1)
@@ -141,26 +145,26 @@ func main() {
 		respStr, _ := ioutil.ReadAll(resp.Body)
 
 		if resp.StatusCode != 200 {
-			if *verbose != "" {
+			if *verbose {
 				fmt.Println("Error flashing the sketch:" + string(respStr))
 			}
 			os.Exit(1)
 		}
 
-		if *verbose != "" {
+		if *verbose {
 			fmt.Println(string(respStr))
 			fmt.Println("Sketch uploaded successfully")
 		}
 	}
 
 	if *resetEndpoint != "" {
-		if *verbose != "" {
+		if *verbose {
 			fmt.Println("Resetting the board")
 		}
 
 		resp, err := http.Post(httpheader+*networkAddress+":"+*networkPort+*resetEndpoint, "", nil)
 		if err != nil {
-			if *verbose != "" {
+			if *verbose {
 				fmt.Println("Failed to reset the board, please reset maually")
 			}
 			os.Exit(0)