From baa94221e81c99636c0538999552debdff811cdc Mon Sep 17 00:00:00 2001
From: andrussal <salumets.andrus@gmail.com>
Date: Tue, 9 Dec 2025 16:11:30 +0100
Subject: [PATCH] Isolate circuits installs per platform and force
 non-interactive

---
 scripts/setup-circuits-stack.sh | 14 ++++++++++----
 scripts/setup-nomos-circuits.sh |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/scripts/setup-circuits-stack.sh b/scripts/setup-circuits-stack.sh
index c0e661c..b4acbc9 100755
--- a/scripts/setup-circuits-stack.sh
+++ b/scripts/setup-circuits-stack.sh
@@ -28,11 +28,17 @@ fi
 KZG_DIR_REL="${NOMOS_KZG_DIR_REL:-testing-framework/assets/stack/kzgrs_test_params}"
 KZG_FILE="${NOMOS_KZG_FILE:-kzgrs_test_params}"
 HOST_DIR_REL_DEFAULT="${NOMOS_CIRCUITS_HOST_DIR_REL:-.tmp/nomos-circuits-host}"
+LINUX_DIR_REL_DEFAULT="${NOMOS_CIRCUITS_LINUX_DIR_REL:-.tmp/nomos-circuits-linux}"
+LINUX_STAGE_DIR="${LINUX_STAGE_DIR:-${ROOT_DIR}/${LINUX_DIR_REL_DEFAULT}}"
+HOST_DIR_REL_DEFAULT="${NOMOS_CIRCUITS_HOST_DIR_REL:-.tmp/nomos-circuits-host}"
 VERSION="${1:-${VERSION:-v0.3.1}}"
 STACK_DIR="${STACK_DIR:-${ROOT_DIR}/${KZG_DIR_REL}}"
 HOST_DIR="${HOST_DIR:-${ROOT_DIR}/${HOST_DIR_REL_DEFAULT}}"
 NOMOS_NODE_REV="${NOMOS_NODE_REV:-d2dd5a5084e1daef4032562c77d41de5e4d495f8}"
 
+# Force non-interactive installs so repeated runs do not prompt.
+export NOMOS_CIRCUITS_NONINTERACTIVE=1
+
 detect_platform() {
   local os arch
   case "$(uname -s)" in
@@ -79,12 +85,12 @@ echo "Workspace: ${ROOT_DIR}"
 LINUX_PLATFORM="linux-x86_64"
 
 echo "Installing Linux bundle for Docker image into ${STACK_DIR}"
-tmp_linux="$(mktemp -d)"
-fetch_bundle "$LINUX_PLATFORM" "$tmp_linux" 0
+rm -rf "${LINUX_STAGE_DIR}"
+mkdir -p "${LINUX_STAGE_DIR}"
+fetch_bundle "$LINUX_PLATFORM" "${LINUX_STAGE_DIR}" 0
 rm -rf "$STACK_DIR"
 mkdir -p "$STACK_DIR"
-cp -R "${tmp_linux}/." "$STACK_DIR/"
-rm -rf "$tmp_linux"
+cp -R "${LINUX_STAGE_DIR}/." "$STACK_DIR/"
 fetch_kzg_params "$STACK_DIR"
 echo "Linux bundle ready at ${STACK_DIR}"
 
diff --git a/scripts/setup-nomos-circuits.sh b/scripts/setup-nomos-circuits.sh
index 27db730..2d16db9 100755
--- a/scripts/setup-nomos-circuits.sh
+++ b/scripts/setup-nomos-circuits.sh
@@ -21,6 +21,7 @@ DEFAULT_INSTALL_DIR="$HOME/.nomos-circuits"
 INSTALL_DIR="${2:-$DEFAULT_INSTALL_DIR}"
 REPO="logos-co/nomos-circuits"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+NONINTERACTIVE="${NOMOS_CIRCUITS_NONINTERACTIVE:-0}"
 
 # Colors for output
 RED='\033[0;31m'
@@ -81,7 +82,7 @@ check_existing_installation() {
         fi
 
         # In non-interactive environments (CI), automatically overwrite
-        if [ ! -t 0 ]; then
+        if [ "$NONINTERACTIVE" = "1" ] || [ ! -t 0 ]; then
             print_info "Non-interactive environment detected, automatically overwriting..."
         else
             # Interactive environment - ask for confirmation