#772 convert to uppercase before reading build environment var

jantje · jantje · commit 54000ef39eb6 · 2017-06-20T00:22:06.000+02:00
diff --git a/io.sloeber.application/.gitignore b/io.sloeber.application/.gitignore
@@ -1,2 +1,3 @@
 /bin
 /target
+/Thumbs.db
diff --git a/io.sloeber.core/src/io/sloeber/core/api/BoardDescriptor.java b/io.sloeber.core/src/io/sloeber/core/api/BoardDescriptor.java
@@ -824,14 +824,13 @@ public IPath getReferencingLibraryPath() {
 	}
 
 	public String getUploadCommand(ICConfigurationDescription confdesc) {
-		String upLoadProtocol = getActualUploadTool(confdesc);
-		return Common.getBuildEnvironmentVariable(confdesc, "A.TOOLS." + upLoadProtocol + ".UPLOAD.PATTERN",
-				upLoadProtocol);
+		String upLoadTool = getActualUploadTool(confdesc);
+		return Common.getBuildEnvironmentVariable(confdesc, "A.TOOLS." + upLoadTool + ".UPLOAD.PATTERN", upLoadTool);
 	}
 
 	public String getActualUploadTool(ICConfigurationDescription confdesc) {
 		if (this.myUploadTool == null && confdesc != null) {
-			return Common.getBuildEnvironmentVariable(confdesc, "A.UPLOAD.TOOL", this.myUploadTool);
+			return Common.getBuildEnvironmentVariable(confdesc, "A.UPLOAD.TOOL", this.myUploadTool.toUpperCase());
 		}
 		return this.myUploadTool;
 	}

Original file line number	Diff line number	Diff line change
`@@ -824,14 +824,13 @@ public IPath getReferencingLibraryPath() {`
`824`	`824`	`}`
`825`	`825`
`826`	`826`	`public String getUploadCommand(ICConfigurationDescription confdesc) {`
`827`		`- String upLoadProtocol = getActualUploadTool(confdesc);`
`828`		`- return Common.getBuildEnvironmentVariable(confdesc, "A.TOOLS." + upLoadProtocol + ".UPLOAD.PATTERN",`
`829`		`- upLoadProtocol);`
	`827`	`+ String upLoadTool = getActualUploadTool(confdesc);`
	`828`	`+ return Common.getBuildEnvironmentVariable(confdesc, "A.TOOLS." + upLoadTool + ".UPLOAD.PATTERN", upLoadTool);`
`830`	`829`	`}`
`831`	`830`
`832`	`831`	`public String getActualUploadTool(ICConfigurationDescription confdesc) {`
`833`	`832`	`if (this.myUploadTool == null && confdesc != null) {`
`834`		`- return Common.getBuildEnvironmentVariable(confdesc, "A.UPLOAD.TOOL", this.myUploadTool);`
	`833`	`+ return Common.getBuildEnvironmentVariable(confdesc, "A.UPLOAD.TOOL", this.myUploadTool.toUpperCase());`
`835`	`834`	`}`
`836`	`835`	`return this.myUploadTool;`
`837`	`836`	`}`