handle all strange cases (files with spaces etc)

works on almost all platforms ("program" doesn't work in darwin)


Former-commit-id: 138c91fa96a41391d4ddd8e0469e447c36a5af1b [formerly 32b12d6f24a6161ac42b4b66362c334110f3772f]
Former-commit-id: 751484155442bdbd5fcc050ae25d1eccf4aa502c

Author: facchinm

hub.go

@@ -173,7 +173,8 @@ func checkCmd(m []byte) {
 
 		args := strings.Split(s, " ")
 		if len(args) > 3 {
-			go spProgram(args[1], args[2], args[3])
+			var slice []string = args[3:len(args)]
+			go spProgram(args[1], args[2], strings.Join(slice, " "))
 		} else {
 			go spErr("You did not specify a port, a board to program and a filename")
 		}

serial.go

@@ -10,6 +10,7 @@ import (
 	//"github.com/kballard/go-shellquote"
 	//"github.com/johnlauer/goserial"
 	//"github.com/mikepb/go-serial"
+	"github.com/kardianos/osext"
 	"go.bug.st/serial"
 	"log"
 	"os"
@@ -673,22 +674,24 @@ func formatCmdline(cmdline string, boardOptions map[string]string) (string, bool
 	return cmdline, true
 }
 
-func assembleCompilerCommand(boardname string, portname string, filePath string) (bool, string, string) {
+func assembleCompilerCommand(boardname string, portname string, filePath string) (bool, string, []string) {
 	// walk across the local filesystem, find boards.txt files, search for the board in it
 
+	execPath, _ := osext.Executable()
+
 	boardFields := strings.Split(boardname, ":")
 	if len(boardFields) != 3 {
 		h.broadcastSys <- []byte("Board need to be specified in core:architecture:name format")
-		return false, "", ""
+		return false, "", nil
 	}
-	file, err := os.Open(boardFields[0] + "/hardware/" + boardFields[1] + "/boards.txt")
+	tempPath := (filepath.Dir(execPath) + "/" + boardFields[0] + "/hardware/" + boardFields[1] + "/boards.txt")
+	file, err := os.Open(tempPath)
 	if err != nil {
 		h.broadcastSys <- []byte("Could not find board: " + boardname)
 		fmt.Println("Error:", err)
-		return false, "", ""
+		return false, "", nil
 	}
 	scanner := bufio.NewScanner(file)
-	cmdline := ""
 	//ide_tools_dir := "./" + boardFields[0] + "/tools"
 
 	boardOptions := make(map[string]string)
@@ -704,16 +707,20 @@ func assembleCompilerCommand(boardname string, portname string, filePath string)
 	}
 
 	boardOptions["serial.port"] = portname
-	boardOptions["build.project_name"] = strings.Trim(filePath, "\n")
+
+	filePath = strings.Trim(filePath, "\n")
+	boardOptions["build.path"] = filepath.Dir(filePath)
+	boardOptions["build.project_name"] = filepath.Base(filePath)
 
 	//fmt.Printf("boardOptions %v %T", boardOptions, boardOptions)
 
 	file.Close()
-	file, err = os.Open(boardFields[0] + "/hardware/" + boardFields[1] + "/platform.txt")
+	tempPath = (filepath.Dir(execPath) + "/" + boardFields[0] + "/hardware/" + boardFields[1] + "/platform.txt")
+	file, err = os.Open(tempPath)
 	if err != nil {
 		h.broadcastSys <- []byte("Could not find board: " + boardname)
 		fmt.Println("Error:", err)
-		return false, "", ""
+		return false, "", nil
 	}
 	scanner = bufio.NewScanner(file)
 
@@ -732,27 +739,30 @@ func assembleCompilerCommand(boardname string, portname string, filePath string)
 	file.Close()
 
 	version := uploadOptions["runtime.tools."+tool+".version"]
-	path, err := filepath.Abs(boardFields[0] + "/tools/" + tool + "/" + version)
+	path := (filepath.Dir(execPath) + "/" + boardFields[0] + "/tools/" + tool + "/" + version)
 	if err != nil {
 		h.broadcastSys <- []byte("Could not find board: " + boardname)
 		fmt.Println("Error:", err)
-		return false, "", ""
+		return false, "", nil
 	}
 
 	boardOptions["runtime.tools.avrdude.path"] = path
 
 	//boardOptions["config.path"] = uploadOptions["tools."+tool+".config.path"]
 	//boardOptions["path"] = uploadOptions["tools."+tool+".path"]
 
-	var winded = true
-
-	cmdline = uploadOptions["tools."+tool+".upload.pattern"]
+	cmdline := uploadOptions["tools."+tool+".upload.pattern"]
 	// remove cmd.path as it is handles differently
 	cmdline = strings.Replace(cmdline, "\"{cmd.path}\"", " ", 1)
 	cmdline = strings.Replace(cmdline, "\"", "", -1)
 
-	for winded != false {
-		cmdline, winded = formatCmdline(cmdline, boardOptions)
+	cmdlineSlice := strings.Split(cmdline, " ")
+	var winded = true
+	for index, _ := range cmdlineSlice {
+		winded = true
+		for winded != false {
+			cmdlineSlice[index], winded = formatCmdline(cmdlineSlice[index], boardOptions)
+		}
 	}
 
 	// cmdline := "-C" + ide_tools_dir + "etc/avrdude.conf" +
@@ -774,14 +784,22 @@ func assembleCompilerCommand(boardname string, portname string, filePath string)
 		port, err := serial.OpenPort(portname, mode)
 		if err != nil {
 			log.Println(err)
-			return false, "", ""
+			return false, "", nil
 		}
 		time.Sleep(time.Second / 2)
 		port.Close()
 		time.Sleep(time.Second * 2)
 	}
 
-	return (tool != ""), tool, cmdline
+	tool = (filepath.Dir(execPath) + "/" + boardFields[0] + "/tools/" + tool + "/bin/" + tool)
+	// the file doesn't exist, we are on windows
+	if _, err := os.Stat(tool); err != nil {
+		tool = tool + ".exe"
+		// convert all "/" to "\"
+		tool = strings.Replace(tool, "/", "\\", -1)
+	}
+
+	return (tool != ""), tool, cmdlineSlice
 }
 
 func findPortByName(portname string) (*serport, bool) {

serialport.go

@@ -8,6 +8,7 @@ import (
 	"io"
 	"log"
 	"os/exec"
+	"runtime"
 	"strconv"
 	"strings"
 )
@@ -413,31 +414,29 @@ func spHandlerClose(p *serport) {
 	h.broadcastSys <- []byte("Closing serial port " + p.portConf.Name)
 }
 
-func spHandlerProgram(flasher string, cmdString string) {
+func spHandlerProgram(flasher string, cmdString []string) {
 
-	s := strings.Split(cmdString, " ")
-	oscmd := exec.Command(flasher, s...)
+	var oscmd *exec.Cmd
+	if runtime.GOOS == "darwin" {
+		sh, _ := exec.LookPath("sh")
+		oscmd = exec.Command(sh+" "+flasher, cmdString...)
+	} else {
+		oscmd = exec.Command(flasher, cmdString...)
+	}
 
 	// Stdout buffer
-	var cmdOutput bytes.Buffer
-	// Attach buffer to command
-	oscmd.Stdout = &cmdOutput
-
-	h.broadcastSys <- []byte("Start flashing with command " + cmdString)
+	//var cmdOutput []byte
 
-	err := oscmd.Start()
-	if err != nil {
-		log.Fatal(err)
-	}
-	log.Printf("Waiting for command to finish... %v", oscmd)
+	//h.broadcastSys <- []byte("Start flashing with command " + cmdString)
+	log.Printf("Flashing with command:" + strings.Join(cmdString, " "))
 
-	err = oscmd.Wait()
+	cmdOutput, err := oscmd.CombinedOutput()
 
 	if err != nil {
-		log.Printf("Command finished with error: %v", err)
-		h.broadcastSys <- []byte("Could not program the board: " + cmdOutput.String())
+		log.Printf("Command finished with error: %v "+string(cmdOutput), err)
+		h.broadcastSys <- []byte("Could not program the board")
 	} else {
-		log.Printf("Finished without error. Good stuff. stdout:%v", cmdOutput.String())
+		log.Printf("Finished without error. Good stuff. stdout: " + string(cmdOutput))
 		h.broadcastSys <- []byte("Flash OK!")
 		// analyze stdin