Adapt WorkflowControllerService

Author: BartChris

Kitodo-Command/src/main/java/org/kitodo/command/Command.java

@@ -45,9 +45,9 @@ public CommandResult runCommand(String command) {
             process = new ProcessBuilder(callSequence).start();
             try (InputStream inputStream = process.getInputStream();
                     InputStream errorInputStream = process.getErrorStream()) {
-                int errCode = process.waitFor();
                 List<String> outputMessage = inputStreamArrayToList(inputStream);
                 List<String> errorMessage = inputStreamArrayToList(errorInputStream);
+                int errCode = process.waitFor();
                 if (Integer.valueOf(errCode).equals(0)) {
                     commandResult = new CommandResult(command, true, outputMessage);
                     logger.info("Execution of Command {} was successful!: {}",

Kitodo/src/main/java/org/kitodo/production/services/data/TaskService.java

@@ -519,7 +519,9 @@ public boolean executeScript(Task task, String script, boolean automatic) throws
                 CommandResult commandResult = commandService.runCommand(script);
                 executedSuccessful = commandResult.isSuccessful();
                 if (executedSuccessful && !commandResult.getMessages().isEmpty()) {
-                    Helper.setMessage(String.join(" | ", commandResult.getMessages()));
+                    for (String message : commandResult.getMessages()){
+                        Helper.setMessage(message);
+                    }
                 }
             }
             finishOrReturnAutomaticTask(task, automatic, executedSuccessful);

Kitodo/src/main/java/org/kitodo/production/services/workflow/WorkflowControllerService.java

@@ -669,9 +669,13 @@ private boolean runScriptCondition(String script, Process process) throws IOExce
                 process, null);
 
         script = replacer.replace(script);
-
-        CommandResult commandResult = ServiceManager.getCommandService().runCommand(script);
-        return commandResult.isSuccessful();
+        try {
+            CommandResult commandResult = ServiceManager.getCommandService().runCommand(script);
+            return commandResult.isSuccessful();
+        } catch (IOException e) {
+            Helper.setErrorMessage("runCommandError", logger, e);
+            return false;
+        }
     }
 
     private boolean runXPathCondition(Process process, String xpath) throws IOException {