diff --git a/README.md b/README.md index cad0bf0..3f17901 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,13 @@ See [`reporter/examples`](reporter/examples) for complete inputs. ## Generate one diagnostic report +```bash +./beffroi.sh diagnostic-pdf capture.json diagnostic.pdf +``` + +This renders the capture directly with the established diagnostic layout. For +the evidence-backed analysis workflow, run: + ```bash ./beffroi.sh diagnostic \ capture.json /path/to/evidence /path/to/new-output \ @@ -44,6 +51,7 @@ destination. ```text ./beffroi.sh report INPUT OUTPUT.pdf +./beffroi.sh diagnostic-pdf CAPTURE OUTPUT.pdf ./beffroi.sh diagnostic CAPTURE EVIDENCE_ROOT OUTPUT_DIR REFERENCE_TIME TITLE AUTHOR DATE ./beffroi.sh all NEW_OUTPUT_DIR ./beffroi.sh package BUILD_DIR ARTIFACT_DIR diff --git a/beffroi.sh b/beffroi.sh index 7378696..0b537fe 100755 --- a/beffroi.sh +++ b/beffroi.sh @@ -6,6 +6,7 @@ usage() { cat <<'EOF' Usage: ./beffroi.sh report INPUT OUTPUT.pdf + ./beffroi.sh diagnostic-pdf CAPTURE OUTPUT.pdf ./beffroi.sh diagnostic CAPTURE EVIDENCE_ROOT OUTPUT_DIR REFERENCE_TIME TITLE AUTHOR DATE ./beffroi.sh all NEW_OUTPUT_DIR ./beffroi.sh package BUILD_DIR ARTIFACT_DIR @@ -28,6 +29,13 @@ case "$command_name" in [[ $# -eq 2 ]]||usage 2; require typst reporter/render.sh "$1" --output "$2" ;; + diagnostic-pdf) + [[ $# -eq 2 ]]||usage 2; require typst + reporter/render-diagnostic.sh "$1" \ + --output "$2" \ + --author "${DIAGNOSTICS_AUTHOR:-Beffroi}" \ + --logo reports/assets/beffroi.png + ;; diagnostic) [[ $# -eq 7 ]]||usage 2; require git typst scripts/workflow.sh all "$@" diff --git a/reporter b/reporter index 23e456e..d4b0f9f 160000 --- a/reporter +++ b/reporter @@ -1 +1 @@ -Subproject commit 23e456e826851c5c54a2cd98412c9f0814755635 +Subproject commit d4b0f9f175a08ccaa490cda6d33e63f18a330e62 diff --git a/scripts/build-publication.sh b/scripts/build-publication.sh index ee1c34f..65351d1 100755 --- a/scripts/build-publication.sh +++ b/scripts/build-publication.sh @@ -8,8 +8,8 @@ mkdir -p "$output_root/reports" "$output_root/diagnostics" reports/tools/convert-legacy-reports.sh reports/reports "$output_root/reports/sources" reporter/tools/validate-all.sh "$output_root/reports/sources" reporter/tools/render-all.sh "$output_root/reports/sources" --output-dir "$output_root/reports/pdfs" -scripts/workflow-all.sh reports/diagnostics \ - reports/diagnostics "$output_root/diagnostic-work" \ - 2026-09-15T12:15:00Z 'Windows diagnostic assessment' "${DIAGNOSTICS_AUTHOR:-Beffroi}" 2026-09-15 -cp -R "$output_root/diagnostic-work/pdfs/." "$output_root/diagnostics/" +reporter/render-diagnostics.sh reports/diagnostics \ + --output-dir "$output_root/diagnostics" \ + --author "${DIAGNOSTICS_AUTHOR:-Beffroi}" \ + --logo reports/assets/beffroi.png echo "Built publishable reports under $output_root"