From 0aab982d64b073e37af56e9a1f6cd6e40d4afc3c Mon Sep 17 00:00:00 2001
From: Xi Yan <xiyan@meta.com>
Date: Tue, 14 Jan 2025 15:07:58 -0800
Subject: [PATCH] alternative run script

---
 llama_stack/distribution/build.py      |  1 +
 llama_stack/distribution/utils/exec.py | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/llama_stack/distribution/build.py b/llama_stack/distribution/build.py
index e7dac7fa7..948764db8 100644
--- a/llama_stack/distribution/build.py
+++ b/llama_stack/distribution/build.py
@@ -153,6 +153,7 @@ def build_image(
         return_code = run_with_pty(args)
     else:
         return_code = run_command(args)
+        print("return code", return_code)
 
     if return_code != 0:
         log.error(
diff --git a/llama_stack/distribution/utils/exec.py b/llama_stack/distribution/utils/exec.py
index 8698253e0..9f416a34d 100644
--- a/llama_stack/distribution/utils/exec.py
+++ b/llama_stack/distribution/utils/exec.py
@@ -99,9 +99,17 @@ def run_with_pty(command):
 
 
 def run_command(command):
-    process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    output, error = process.communicate()
-    if process.returncode != 0:
-        log.error(f"Error: {error.decode('utf-8')}")
-        sys.exit(1)
-    return output.decode("utf-8")
+    try:
+        result = subprocess.run(command, capture_output=True, text=True, check=True)
+        print("Script Output:", result.stdout)
+        return result.returncode
+    except subprocess.CalledProcessError as e:
+        print("Error running script:", e)
+        print("Error output:", e.stderr)
+        return e.returncode
+    # process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    # output, error = process.communicate()
+    # if process.returncode != 0:
+    #     log.error(f"Error: {error.decode('utf-8')}")
+    #     sys.exit(1)
+    # return output.decode("utf-8")