From 860eaae975883c9dda248aa0756b4c03623265e4 Mon Sep 17 00:00:00 2001
From: Jimmy Tanagra <jcode@tanagra.id.au>
Date: Sun, 11 May 2025 20:42:06 +1000
Subject: [PATCH] allow unspecified userdata dir when --command is given

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
---
 .../org/openhab/core/tools/UpgradeTool.java   | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/tools/upgradetool/src/main/java/org/openhab/core/tools/UpgradeTool.java b/tools/upgradetool/src/main/java/org/openhab/core/tools/UpgradeTool.java
index 2d419d84e..f8eee3e92 100644
--- a/tools/upgradetool/src/main/java/org/openhab/core/tools/UpgradeTool.java
+++ b/tools/upgradetool/src/main/java/org/openhab/core/tools/UpgradeTool.java
@@ -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());