From fa84b1a94be4abc77cde46eec8328b96d8c17cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <vit.kucera@cern.ch>
Date: Fri, 13 Dec 2024 17:36:57 +0100
Subject: [PATCH] Improve O2 command generation

---
 codeHF/workflows.yml    | 2 +-
 exec/make_command_o2.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/codeHF/workflows.yml b/codeHF/workflows.yml
index 9652aa6b..0bbb19b2 100644
--- a/codeHF/workflows.yml
+++ b/codeHF/workflows.yml
@@ -8,7 +8,7 @@ options:
     - "--resources-monitoring 2"
   local:  # used for every workflow
     - "-b"
-    - "--configuration json://$JSON"
+    - "--configuration json://\"$JSON\""
     # - "--min-failure-level error"
 
 workflows:
diff --git a/exec/make_command_o2.py b/exec/make_command_o2.py
index 61b4eb63..9ead8ab0 100644
--- a/exec/make_command_o2.py
+++ b/exec/make_command_o2.py
@@ -291,8 +291,8 @@ def main():
         command += "| \\\n" + string_wf + " "
     if not command:
         msg_fatal("Nothing to do!")
-    # Remove the leading "| \\\n".
-    command = command[4:]
+    # Remove the leading "| \\\n" and the trailing " ".
+    command = command[4:-1]
     # Append performance profiling options.
     if perf:
         opt_perf = "perf record -F 99 -g --call-graph dwarf --user-callchains"