rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

console updater does not work if folder name contains spaces fix #3927

This commit is contained in:
rusefillc 2022-02-12 10:42:31 -05:00
parent acfdc3cb88
commit 5310d022ce
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/CHANGELOG.md
View File

@ -32,6 +32,7 @@ All notable user-facing or behavior-altering changes will be documented in this
### Fixed ### Fixed
- SD card logging with SDIO hardware #3873 - SD card logging with SDIO hardware #3873
- rusEFI console stability improvement #3912 - rusEFI console stability improvement #3912
- console updater does not work if folder name contains spaces #3927
## Removed ## Removed
- Miata NB1 trigger was merged with Miata NB2 trigger - Miata NB1 trigger was merged with Miata NB2 trigger

7
java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java
View File

@ -178,11 +178,16 @@ public class DfuFlasher {
String hexFileName = IniFileModel.findFile(Launcher.INPUT_FILES_PATH, prefix, suffix); String hexFileName = IniFileModel.findFile(Launcher.INPUT_FILES_PATH, prefix, suffix);
if (hexFileName == null) if (hexFileName == null)
throw new FileNotFoundException("File not found " + prefix + "*" + suffix); throw new FileNotFoundException("File not found " + prefix + "*" + suffix);
String hexAbsolutePath = new File(hexFileName).getAbsolutePath(); // we need quotes in case if absolute path contains spaces
String hexAbsolutePath = quote(new File(hexFileName).getAbsolutePath());
return DFU_BINARY_LOCATION + "/" + DFU_BINARY + " -c port=usb1 -w " + hexAbsolutePath + " -v -s"; return DFU_BINARY_LOCATION + "/" + DFU_BINARY + " -c port=usb1 -w " + hexAbsolutePath + " -v -s";
} }
private static String quote(String absolutePath) {
return "\"" + absolutePath + "\"";
}
private static String getDfuEraseCommand() { private static String getDfuEraseCommand() {
return DFU_BINARY_LOCATION + "/" + DFU_BINARY + " -c port=usb1 -e all"; return DFU_BINARY_LOCATION + "/" + DFU_BINARY + " -c port=usb1 -e all";
} }