demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

allow unspecified userdata dir when --command is given

Browse Source 
Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
This commit is contained in:
Jimmy Tanagra
2025-05-18 19:10:37 +02:00
committed by Kai Kreuzer
parent 482848117e
commit 860eaae975
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/upgradetool/src/main/java/org/openhab/core/tools/UpgradeTool.java
+16 -10
View File
@@ -95,9 +95,17 @@ public class UpgradeTool {
System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, loglevel);
boolean force = commandLine.hasOption(OPT_FORCE);
String command = commandLine.hasOption(OPT_COMMAND) ? commandLine.getOptionValue(OPT_COMMAND) : null;
if (command != null && UPGRADERS.stream().filter(u -> u.getName().equals(command)).findAny().isEmpty()) {
println("Unknown command: " + command);
System.exit(0);
}
String userdataDir = commandLine.hasOption(OPT_USERDATA_DIR) ? commandLine.getOptionValue(OPT_USERDATA_DIR)
: System.getenv("OPENHAB_USERDATA");
if (userdataDir == null || userdataDir.isBlank()) {
if (command == null && (userdataDir == null || userdataDir.isBlank())) {
println("Please either set the environment variable ${OPENHAB_USERDATA} or provide a directory through the --userdata option.");
System.exit(0);
return;
@@ -111,14 +119,6 @@ public class UpgradeTool {
return;
}
boolean force = commandLine.hasOption(OPT_FORCE);
String command = commandLine.hasOption(OPT_COMMAND) ? commandLine.getOptionValue(OPT_COMMAND) : null;
if (command != null && UPGRADERS.stream().filter(u -> u.getName().equals(command)).findAny().isEmpty()) {
println("Unknown command: " + command);
System.exit(0);
}
Path upgradeJsonDatabasePath = Path.of(userdataDir, "jsondb", "org.openhab.core.tools.UpgradeTool");
upgradeRecords = new JsonStorage<>(upgradeJsonDatabasePath.toFile(), null, 5, 0, 0, List.of());
@@ -135,7 +135,13 @@ public class UpgradeTool {
try {
logger.info("Executing {}: {}", upgraderName, upgrader.getDescription());
if (upgrader.execute(userdataDir, confDir)) {
updateUpgradeRecord(upgraderName);
if (userdataDir != null) {
updateUpgradeRecord(upgraderName);
} else {
logger.warn(
"The Upgrade record for '{}' is not updated because user data directory wasn't specified",
upgraderName);
}
}
} catch (Exception e) {
logger.error("Error executing upgrader {}: {}", upgraderName, e.getMessage());