OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

inform about quoting paths, fix missing userdata dir 

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
pull/4718/head
Jimmy Tanagra 2025-05-11 22:02:54 +10:00 committed by Kai Kreuzer
parent b55b486360
commit d8c07d5601
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/upgradetool/src/main/java/org/openhab/core/tools/UpgradeTool.java
View File

@ -60,10 +60,12 @@ public class UpgradeTool {
private static Options getOptions() { private static Options getOptions() {
Options options = new Options(); Options options = new Options();
options.addOption(Option.builder().longOpt(OPT_USERDATA_DIR).desc("USERDATA directory to process") options.addOption(Option.builder().longOpt(OPT_USERDATA_DIR).desc(
"USERDATA directory to process. Enclose it in double quotes to ensure that any backslashes are not ignored by your command shell.")
.numberOfArgs(1).build());
options.addOption(Option.builder().longOpt(OPT_CONF_DIR).desc(
"CONF directory to process. Enclose it in double quotes to ensure that any backslashes are not ignored by your command shell.")
.numberOfArgs(1).build()); .numberOfArgs(1).build());
options.addOption(
Option.builder().longOpt(OPT_CONF_DIR).desc("CONF directory to process").numberOfArgs(1).build());
options.addOption(Option.builder().longOpt(OPT_COMMAND).numberOfArgs(1) options.addOption(Option.builder().longOpt(OPT_COMMAND).numberOfArgs(1)
.desc("command to execute (executes all if omitted)").build()); .desc("command to execute (executes all if omitted)").build());
options.addOption(Option.builder().longOpt(OPT_LIST_COMMANDS).desc("list available commands").build()); options.addOption(Option.builder().longOpt(OPT_LIST_COMMANDS).desc("list available commands").build());
@ -111,6 +113,8 @@ public class UpgradeTool {
return; return;
} else if (userdataDir != null) { } else if (userdataDir != null) {
logger.info("Using userdataDir: {}", userdataDir); logger.info("Using userdataDir: {}", userdataDir);
Path upgradeJsonDatabasePath = Path.of(userdataDir, "jsondb", "org.openhab.core.tools.UpgradeTool");
upgradeRecords = new JsonStorage<>(upgradeJsonDatabasePath.toFile(), null, 5, 0, 0, List.of());
} }
String confDir = commandLine.hasOption(OPT_CONF_DIR) ? commandLine.getOptionValue(OPT_CONF_DIR) String confDir = commandLine.hasOption(OPT_CONF_DIR) ? commandLine.getOptionValue(OPT_CONF_DIR)
@ -123,9 +127,6 @@ public class UpgradeTool {
logger.info("Using confDir: {}", confDir); logger.info("Using confDir: {}", confDir);
} }
Path upgradeJsonDatabasePath = Path.of(userdataDir, "jsondb", "org.openhab.core.tools.UpgradeTool");
upgradeRecords = new JsonStorage<>(upgradeJsonDatabasePath.toFile(), null, 5, 0, 0, List.of());
UPGRADERS.forEach(upgrader -> { UPGRADERS.forEach(upgrader -> {
String upgraderName = upgrader.getName(); String upgraderName = upgrader.getName();
if (command != null && !upgraderName.equals(command)) { if (command != null && !upgraderName.equals(command)) {
@ -139,13 +140,7 @@ public class UpgradeTool {
try { try {
logger.info("Executing {}: {}", upgraderName, upgrader.getDescription()); logger.info("Executing {}: {}", upgraderName, upgrader.getDescription());
if (upgrader.execute(userdataDir, confDir)) { if (upgrader.execute(userdataDir, confDir)) {
if (userdataDir != null) { updateUpgradeRecord(upgraderName);
updateUpgradeRecord(upgraderName);
} else {
logger.warn(
"The Upgrade record for '{}' is not updated because user data directory wasn't specified",
upgraderName);
}
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("Error executing upgrader {}: {}", upgraderName, e.getMessage()); logger.error("Error executing upgrader {}: {}", upgraderName, e.getMessage());