From 606e2c749a62d8aaa4525de84a417d671e5a5b8c Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 26 Sep 2024 01:12:05 +0200
Subject: [PATCH] cls_cmd: execute commands through bash
The next commit will use "echo -e". The problem with that is that bash
and sh differ:
- in bash: this results in "a\nb" (a+newline+b)
- in sh: this results in -e a\nb (-e a+newline+b)
The problem is that by default, commands are executed through sh, which
nobody expects. Change to bash, which is likely more aligned with what
people want to use.
---
ci-scripts/cls_cmd.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ci-scripts/cls_cmd.py b/ci-scripts/cls_cmd.py
index 52fae37a08a..f1527fd08ae 100644
--- a/ci-scripts/cls_cmd.py
+++ b/ci-scripts/cls_cmd.py
@@ -106,10 +106,10 @@ class LocalCmd(Cmd):
if line.strip().endswith('&'):
# if we wait for stdout, subprocess does not return before the end of the command
# however, we don't want to wait for commands with &, so just return fake command
- ret = sp.run(line, shell=True, cwd=self.cwd, timeout=5)
+ ret = sp.run(line, shell=True, cwd=self.cwd, timeout=5, executable='/bin/bash')
time.sleep(0.1)
else:
- ret = sp.run(line, shell=True, cwd=self.cwd, stdout=sp.PIPE, stderr=sp.STDOUT, timeout=timeout)
+ ret = sp.run(line, shell=True, cwd=self.cwd, stdout=sp.PIPE, stderr=sp.STDOUT, timeout=timeout, executable='/bin/bash')
except Exception as e:
ret = sp.CompletedProcess(args=line, returncode=255, stdout=f'Exception: {str(e)}'.encode('utf-8'))
if ret.stdout is None:
--
GitLab