Reversing the order of the flashCerts() and flashFirmware() functions

Fede85 · Fede85 · commit 3089dd4449b4 · 2015-12-22T16:45:12.000+01:00
allows to use both commands in the same command line preventing certificates from being deleted when the firmware is flashed
diff --git a/src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/cli/main/winc1500-uploader.go b/src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/cli/main/winc1500-uploader.go
@@ -91,14 +91,14 @@ func main() {
 		log.Fatalf("Programmer reports %d as maximum payload size (1024 is needed)", payloadSize)
 	}
 
-	if rootCertDir != "" || len(addresses) != 0 {
-		if err := flashCerts(); err != nil {
+	if firmwareFile != "" {
+		if err := flashFirmware(); err != nil {
 			log.Fatal(err)
 		}
 	}
 
-	if firmwareFile != "" {
-		if err := flashFirmware(); err != nil {
+	if rootCertDir != "" || len(addresses) != 0 {
+		if err := flashCerts(); err != nil {
 			log.Fatal(err)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -91,14 +91,14 @@ func main() {`
`91`	`91`	`log.Fatalf("Programmer reports %d as maximum payload size (1024 is needed)", payloadSize)`
`92`	`92`	`}`
`93`	`93`
`94`		`- if rootCertDir != "" \|\| len(addresses) != 0 {`
`95`		`- if err := flashCerts(); err != nil {`
	`94`	`+ if firmwareFile != "" {`
	`95`	`+ if err := flashFirmware(); err != nil {`
`96`	`96`	`log.Fatal(err)`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`		`- if firmwareFile != "" {`
`101`		`- if err := flashFirmware(); err != nil {`
	`100`	`+ if rootCertDir != "" \|\| len(addresses) != 0 {`
	`101`	`+ if err := flashCerts(); err != nil {`
`102`	`102`	`log.Fatal(err)`
`103`	`103`	`}`
`104`	`104`	`}`