From 77fecf27eb68500d62df3d056ce98d999af13839 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephen@that.guru>
Date: Fri, 9 Jan 2026 18:10:43 +0000
Subject: [PATCH 1/2] bin/generate-samples: Remove warning about sleep

The sleep itself has been commented out for a long time (commit
04fa53b69266 from September 2023, to be specific).

Signed-off-by: Stephen Finucane <stephen@that.guru>
---
 bin/generate-samples.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bin/generate-samples.sh b/bin/generate-samples.sh
index 197eb9183912..f1d3303024ac 100755
--- a/bin/generate-samples.sh
+++ b/bin/generate-samples.sh
@@ -52,8 +52,6 @@ if [[ ${#files[@]} -eq 1 && "${files[0]}" != *'*'* ]]; then
     # shellcheck disable=SC2068
     java ${JAVA_OPTS} -jar "$executable" generate -c ${files[0]} ${args[@]}
 else
-    echo "Please press CTRL+C to stop or the script will continue in 5 seconds."
-    #sleep 5
     if [ ${#files[@]} -eq 0 ]; then
       files=("${root}"/bin/configs/*.yaml)
     fi

From 588b3a9ce0e5ccf8d0fe42b672ad3a138b7b1ab4 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephen@that.guru>
Date: Tue, 20 Jan 2026 13:36:36 +0000
Subject: [PATCH 2/2] bin/generate-samples: Fix output on tmux

Commit 23dae2bcd8c9 reworked this script to start capturing exceptions
but the mechanism used was crude and broke output on tmux, since
`/dev/pts/0` is hardcoded to a specific pseudo-terminal but each tmux
pane gets its own pts. Rework this to use files instead.

Signed-off-by: Stephen Finucane <stephen@that.guru>
---
 bin/generate-samples.sh | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/bin/generate-samples.sh b/bin/generate-samples.sh
index f1d3303024ac..b282b313c5c2 100755
--- a/bin/generate-samples.sh
+++ b/bin/generate-samples.sh
@@ -47,24 +47,26 @@ For example:
 
 echo "$header"
 
+tmpfile=$(mktemp)
+trap "rm -f $tmpfile" EXIT
+
 if [[ ${#files[@]} -eq 1 && "${files[0]}" != *'*'* ]]; then
-    # shellcheck disable=SC2086
-    # shellcheck disable=SC2068
-    java ${JAVA_OPTS} -jar "$executable" generate -c ${files[0]} ${args[@]}
+  # shellcheck disable=SC2086
+  # shellcheck disable=SC2068
+  java ${JAVA_OPTS} -jar "$executable" generate -c ${files[0]} ${args[@]} 2>&1 | tee "$tmpfile"
+  retcode=${PIPESTATUS[0]}
 else
-    if [ ${#files[@]} -eq 0 ]; then
-      files=("${root}"/bin/configs/*.yaml)
-    fi
+  if [ ${#files[@]} -eq 0 ]; then
+    files=("${root}"/bin/configs/*.yaml)
+  fi
 
-    # shellcheck disable=SC2086
-    # shellcheck disable=SC2068
-    if java ${JAVA_OPTS} -jar "$executable" batch ${BATCH_OPTS} --includes-base-dir "${root}" --fail-fast  -- ${files[@]} 2>&1 | tee /dev/pts/0 | grep -q -i "exception"; then
-      echo "Found exception(s) when running the generator(s) to update the samples."
-      export GENERATE_ERROR=1
-    fi
+  # shellcheck disable=SC2086
+  # shellcheck disable=SC2068
+  java ${JAVA_OPTS} -jar "$executable" batch ${BATCH_OPTS} --includes-base-dir "${root}" --fail-fast  -- ${files[@]} 2>&1 | tee "$tmpfile"
+  retcode=${PIPESTATUS[0]}
 fi
 
-if [[ -n "$GENERATE_ERROR" ]]; then
+if [[ $retcode -ne 0 ]] || grep -q -i "exception" "$tmpfile"; then
   echo "Found exception(s) when running the generator(s) to update the samples."
   exit 1
 fi