Skip to content

Commit 2e64e21

Browse files
authored
Merge pull request #323 from arduino/devel
Fix unowifirev2 upload on windows
2 parents 5d291ec + 36a350f commit 2e64e21

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ The results of the upload will be delivered via websocket with messages that loo
380380

381381
## Development
382382

383-
Please remember that for compile the project, you need go version <= 1.8.7 (more recent versions are not supported for compile)
383+
Please remember that for compile the project, you need go version >= 1.10.x (older versions are not supported for compile)
384384

385385
To clone the repository, run the following command:
386386
```
@@ -398,7 +398,7 @@ go build
398398
This will create the `arduino-create-agent` binary.
399399

400400
Other prerequisites are:
401-
* libappindicator (Linux only on Ubuntu `sudo apt-get install libappindicator1`)
401+
* libappindicator (Linux only on Ubuntu `sudo apt-get install libappindicator1 libappindicator3-0.1-cil libappindicator3-0.1-cil-dev libappindicator3-1 libappindicator3-dev libgtk-3-0 libgtk-3-dev`)
402402
* [go-selfupdate] (https://github.com/sanbornm/go-selfupdate) if you want to test automatic updates
403403

404404
## Submitting an issue

info.go

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"runtime"
45
"strings"
56

67
"github.com/gin-gonic/gin"
@@ -20,6 +21,7 @@ func infoHandler(c *gin.Context) {
2021
"wss": "wss://localhost" + portSSL,
2122
"origins": origins,
2223
"update_url": updateUrl,
24+
"os": runtime.GOOS + ":" + runtime.GOARCH,
2325
})
2426
}
2527

upload/upload.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func PartiallyResolve(board, file, platformPath, commandline string, extra Extra
5555
commandline = strings.Replace(commandline, "{build.path}", filepath.ToSlash(filepath.Dir(file)), -1)
5656
commandline = strings.Replace(commandline, "{build.project_name}", strings.TrimSuffix(filepath.Base(file), filepath.Ext(filepath.Base(file))), -1)
5757
commandline = strings.Replace(commandline, "{network.password}", extra.Auth.Password, -1)
58-
commandline = strings.Replace(commandline, "{runtime.platform.path}", platformPath, -1)
58+
commandline = strings.Replace(commandline, "{runtime.platform.path}", filepath.ToSlash(platformPath), -1)
5959

6060
if extra.Verbose == true {
6161
commandline = strings.Replace(commandline, "{upload.verbose}", extra.ParamsVerbose, -1)

0 commit comments

Comments
 (0)