Skip to content

Fix unowifirev2 upload on windows #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 5, 2019
Merged

Fix unowifirev2 upload on windows #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc97c07
Update build docs
murilopolese Dec 7, 2018
fcb613a
Merge pull request #273 from murilopolese/build-docs
rsora Dec 11, 2018
da67d01
Return info about the system
matteosuppo Mar 4, 2019
cf149fa
Merge pull request #321 from arduino/osinfo
matteosuppo Mar 4, 2019
bcce628
sanitize paths when replacing {runtime.platform.path}
Mar 4, 2019
36a350f
Merge pull request #322 from arduino/runtime-platform-path-fix-win
matteosuppo Mar 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ The results of the upload will be delivered via websocket with messages that loo

## Development

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

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

Other prerequisites are:
* libappindicator (Linux only on Ubuntu `sudo apt-get install libappindicator1`)
* 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`)
* [go-selfupdate] (https://github.com/sanbornm/go-selfupdate) if you want to test automatic updates

## Submitting an issue
Expand Down
2 changes: 2 additions & 0 deletions info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"runtime"
"strings"

"github.com/gin-gonic/gin"
Expand All @@ -20,6 +21,7 @@ func infoHandler(c *gin.Context) {
"wss": "wss://localhost" + portSSL,
"origins": origins,
"update_url": updateUrl,
"os": runtime.GOOS + ":" + runtime.GOARCH,
})
}

Expand Down
2 changes: 1 addition & 1 deletion upload/upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func PartiallyResolve(board, file, platformPath, commandline string, extra Extra
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, "{network.password}", extra.Auth.Password, -1)
commandline = strings.Replace(commandline, "{runtime.platform.path}", platformPath, -1)
commandline = strings.Replace(commandline, "{runtime.platform.path}", filepath.ToSlash(platformPath), -1)

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