Merge remote-tracking branch 'origin/devel' into test_configs

Author: facchinm

tools/download.go

@@ -51,10 +51,11 @@ type index struct {
 }
 
 var systems = map[string]string{
-	"linuxamd64":  "x86_64-linux-gnu",
-	"linux386":    "i686-linux-gnu",
-	"darwinamd64": "apple-darwin",
-	"windows386":  "i686-mingw32",
+	"linuxamd64":   "x86_64-linux-gnu",
+	"linux386":     "i686-linux-gnu",
+	"darwinamd64":  "apple-darwin",
+	"windows386":   "i686-mingw32",
+	"windowsamd64": "i686-mingw32",
 }
 
 func mimeType(data []byte) (string, error) {

upload/upload.go

@@ -54,6 +54,7 @@ type Extra struct {
 func PartiallyResolve(board, file, commandline string, extra Extra, t Locater) (string, error) {
 	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)
 
 	if extra.Verbose == true {
 		commandline = strings.Replace(commandline, "{upload.verbose}", extra.ParamsVerbose, -1)