demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 13:21:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Make --dir param optional for upgradetool (#3591)

Browse Source 
* Make --dir param optional for upgradetool

Almost all openHAB installations should have the $OPENHAB_USERDATA env variable set.
If this is the case, the user does not have to provide a directory, so this parameter can be made optional.

Signed-off-by: Kai Kreuzer <kai@openhab.org>
This commit is contained in:
Kai Kreuzer 2023-05-04 09:08:26 +02:00 committed by GitHub
parent c8464870bb
commit 9c59071038
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,8 +41,7 @@ public class UpgradeTool {
private static Options getOptions() {
Options options = new Options();
options.addOption(
Option.builder().longOpt(OPT_DIR).desc("directory to process").numberOfArgs(1).required().build());
options.addOption(Option.builder().longOpt(OPT_DIR).desc("directory to process").numberOfArgs(1).build());
options.addOption(Option.builder().longOpt(OPT_COMMAND).numberOfArgs(1).desc("command to execute").build());
options.addOption(Option.builder().longOpt(OPT_LOG).numberOfArgs(1).desc("log verbosity").build());
options.addOption(Option.builder().longOpt(OPT_FORCE).desc("force execution (even if already done)").build());
@ -64,14 +63,21 @@ public class UpgradeTool {
System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, loglevel);
String baseDir = commandLine.hasOption(OPT_DIR) ? commandLine.getOptionValue(OPT_DIR) : "";
boolean force = commandLine.hasOption(OPT_FORCE) ? true : false;
String baseDir = commandLine.hasOption(OPT_DIR) ? commandLine.getOptionValue(OPT_DIR)
: System.getenv("OPENHAB_USERDATA");
if (baseDir == null || baseDir.isBlank()) {
System.out.println(
"Please either set the environment variable ${OPENHAB_USERDATA} or provide a directory through the --dir option.");
System.exit(0);
} else {
boolean force = commandLine.hasOption(OPT_FORCE) ? true : false;
Upgrader upgrader = new Upgrader(baseDir, force);
if (commandLine.hasOption(ITEM_COPY_UNIT_TO_METADATA)) {
upgrader.itemCopyUnitToMetadata();
} else if (commandLine.hasOption(LINK_UPGRADE_JS_PROFILE)) {
upgrader.linkUpgradeJsProfile();
Upgrader upgrader = new Upgrader(baseDir, force);
if (commandLine.hasOption(ITEM_COPY_UNIT_TO_METADATA)) {
upgrader.itemCopyUnitToMetadata();
} else if (commandLine.hasOption(LINK_UPGRADE_JS_PROFILE)) {
upgrader.linkUpgradeJsProfile();
}
}
} catch (ParseException e) {
HelpFormatter formatter = new HelpFormatter();