From a9a732eb0529e60ae193fefe0c818bbb4cb0c2b2 Mon Sep 17 00:00:00 2001 From: kami Date: Sat, 29 Aug 2026 21:01:39 +0400 Subject: [PATCH] orchestra: pre-release WIP snapshot (orchestra-06g4ww6tnd26m16cza6we5t458-be13b045) --- scripts/orchestra_e2e_healthcheck.sh | 9 +++++++-- scripts/test_healthcheck.sh | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/orchestra_e2e_healthcheck.sh b/scripts/orchestra_e2e_healthcheck.sh index f6fa7ee..ae07126 100755 --- a/scripts/orchestra_e2e_healthcheck.sh +++ b/scripts/orchestra_e2e_healthcheck.sh @@ -73,6 +73,11 @@ emit() { [ "$format" = none ] || printf "$@" } +# json_body : the --json object, no trailing newline. +json_body() { + printf '{"status":"ok","checks":%d,"version":"%s"%s}' "$1" "$VERSION" "$2" +} + # usage : the --help body. Also the source check_usage_text_mentions_every_flag # reads, so the flag list has exactly one home. usage() { @@ -80,7 +85,7 @@ usage() { emit "$1" 'Healthcheck script for Orchestra E2E tests.\n' emit "$1" 'Exits 0 with a success message if all checks pass.\n' emit "$1" ' --quiet Suppress the success message; still exits 0.\n' - emit "$1" ' --json Print a single-line JSON result; still exits 0.\n' + emit "$1" ' --json Print a single-line JSON result with the version; still exits 0.\n' emit "$1" ' --help Print this usage text and exit 0.\n' emit "$1" ' --summary Print one line per check before the success message.\n' emit "$1" ' --timing Print elapsed milliseconds for the run.\n' @@ -160,7 +165,7 @@ main() { if [ "$format" = json ]; then local timings= [ -n "$timing" ] && timings=",\"timings\":{\"healthchecks\":$elapsed}" - emit "$format" '{"status":"ok","checks":%d%s}\n' "$TOTAL" "$timings" + emit "$format" '%s\n' "$(json_body "$TOTAL" "$timings")" exit 0 fi diff --git a/scripts/test_healthcheck.sh b/scripts/test_healthcheck.sh index 3b7cfea..f90bcd9 100755 --- a/scripts/test_healthcheck.sh +++ b/scripts/test_healthcheck.sh @@ -7,7 +7,7 @@ NAMES='repo_root_readable scripts_dir_present healthcheck_executable_bit selftest_present test_healthcheck_present readme_present no_crlf_line_endings no_tabs_in_scripts shebang_is_bash usage_text_mentions_every_flag' -USAGE="$(printf 'Usage: orchestra_e2e_healthcheck.sh [--quiet] [--json] [--summary] [--timing] [--strict] [--list-checks]\n\nHealthcheck script for Orchestra E2E tests.\nExits 0 with a success message if all checks pass.\n --quiet Suppress the success message; still exits 0.\n --json Print a single-line JSON result; still exits 0.\n --help Print this usage text and exit 0.\n --summary Print one line per check before the success message.\n --timing Print elapsed milliseconds for the run.\n --strict Reject an unrecognised flag: exits 2.\n --list-checks Print the name of each check; exits 0.\n\nChecks:\n repo_root_readable\n scripts_dir_present\n healthcheck_executable_bit\n selftest_present\n test_healthcheck_present\n readme_present\n no_crlf_line_endings\n no_tabs_in_scripts\n shebang_is_bash\n usage_text_mentions_every_flag\n\nVersion: 1.0.0')" +USAGE="$(printf 'Usage: orchestra_e2e_healthcheck.sh [--quiet] [--json] [--summary] [--timing] [--strict] [--list-checks]\n\nHealthcheck script for Orchestra E2E tests.\nExits 0 with a success message if all checks pass.\n --quiet Suppress the success message; still exits 0.\n --json Print a single-line JSON result with the version; still exits 0.\n --help Print this usage text and exit 0.\n --summary Print one line per check before the success message.\n --timing Print elapsed milliseconds for the run.\n --strict Reject an unrecognised flag: exits 2.\n --list-checks Print the name of each check; exits 0.\n\nChecks:\n repo_root_readable\n scripts_dir_present\n healthcheck_executable_bit\n selftest_present\n test_healthcheck_present\n readme_present\n no_crlf_line_endings\n no_tabs_in_scripts\n shebang_is_bash\n usage_text_mentions_every_flag\n\nVersion: 1.0.0')" fails=0 check() { # check