2.2.2: add fallback strategy if fw path is empty

facchinm · facchinm · commit 2ccbd62d74b9 · 2017-09-27T12:22:48.000+02:00
diff --git a/main.go b/main.go
@@ -34,7 +34,7 @@ var (
 	rtos_compliance_offset = flag.Int("rtos_fw_pos", 0, "RTOS FW ID offset")
 )
 
-const Version = "2.2.1"
+const Version = "2.2.2"
 
 const dfu_flags = "-d,8087:0ABA"
 const rtos_firmware = "quark.bin"
@@ -201,7 +201,14 @@ func main_load() {
 		}
 	}
 
-	firmwarePath := *core
+	firmwarePath, _ := os.Executable()
+	firmwarePath = filepath.Join(filepath.Dir(firmwarePath), "firmwares")
+
+	if stat, err := os.Stat(*core); err == nil && stat.IsDir() {
+    	firmwarePath = *core
+	} else {
+		firmwarePath = filepath.Join(firmwarePath, *core)
+	}
 
 	if needUpdateBLE || *force == true {
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ var (`
`34`	`34`	`rtos_compliance_offset = flag.Int("rtos_fw_pos", 0, "RTOS FW ID offset")`
`35`	`35`	`)`
`36`	`36`
`37`		`-const Version = "2.2.1"`
	`37`	`+const Version = "2.2.2"`
`38`	`38`
`39`	`39`	`const dfu_flags = "-d,8087:0ABA"`
`40`	`40`	`const rtos_firmware = "quark.bin"`
`@@ -201,7 +201,14 @@ func main_load() {`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`
`204`		`- firmwarePath := *core`
	`204`	`+ firmwarePath, _ := os.Executable()`
	`205`	`+ firmwarePath = filepath.Join(filepath.Dir(firmwarePath), "firmwares")`
	`206`	`+`
	`207`	`+ if stat, err := os.Stat(*core); err == nil && stat.IsDir() {`
	`208`	`+ firmwarePath = *core`
	`209`	`+ } else {`
	`210`	`+ firmwarePath = filepath.Join(firmwarePath, *core)`
	`211`	`+ }`
`205`	`212`
`206`	`213`	`if needUpdateBLE \|\| *force == true {`
`207`	`214`