From 3d4437fb83469556772e5f62c8bf8aeee2ecf4ac Mon Sep 17 00:00:00 2001
From: Sam Dasilva <samuelramos852@gmail.com>
Date: Wed, 20 Aug 2025 19:47:30 -0400
Subject: [PATCH] ci: Adapt justfile to new command structure

Signed-off-by: Sam Dasilva <samuelramos852@gmail.com>
---
 Justfile  | 17 ++++++++---------
 README.md | 10 +++++-----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Justfile b/Justfile
index ac90e60..72d72da 100644
--- a/Justfile
+++ b/Justfile
@@ -49,21 +49,20 @@ test:
 build:
   cargo build -q -p {{CLI_PKG}} --release --locked {{CARGO_FLAGS}}
 
+lowell *ARGS:
+  cargo run -p {{CLI_PKG}} --release -- {{ARGS}}
+
 # --- Inspect helpers --------------------------------------------------------
 
 # Run: just inspect ../uki-out/vmlinuz-virt.efi
-inspect uki: build
-  {{BIN}} --log-level {{RUST_LOG}} inspect uki --file {{uki}}
-
-# Run: just inspect-json ../uki-out/vmlinuz-virt.efi
-inspect-json uki: build
-  {{BIN}} --log-level {{RUST_LOG}} inspect uki --file {{uki}} --format json
+uki-inspect uki *ARGS: build
+  {{BIN}} --log-level {{RUST_LOG}} uki inspect {{uki}} {{ARGS}}
 
 # Use UKI_PATH from env/.env:
 #   echo 'UKI_PATH=../uki-out/vmlinuz-virt.efi' > .env
 #   just inspect-env
-inspect-env: build
-  {{BIN}} --log-level {{RUST_LOG}} inspect uki --file "${UKI_PATH:?Set UKI_PATH in env or .env}"
+uki-inspect-env: build
+  {{BIN}} --log-level {{RUST_LOG}} uki inspect "${UKI_PATH:?Set UKI_PATH in env or .env}"
 
 # --- CI aggregate -----------------------------------------------------------
 
@@ -88,5 +87,5 @@ smoke uki='':
 # quick, release-mode JSON inspect (good for timing locally)
 #   just fast ../uki-out/vmlinuz-virt.efi
 fast uki: build
-  {{BIN}} --log-level {{RUST_LOG}} inspect uki --file {{uki}} --json
+  {{BIN}} --log-level {{RUST_LOG}} uki inspect {{uki}} --format json
 
diff --git a/README.md b/README.md
index 793b310..6ff2769 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,8 @@ Still under early active development:
 
 * **Works today**
 
-  * CLI: `lowell inspect uki --file /path/to/vmlinuz.efi`
-  * Flags: `--format json|human`, `--verbose`, global `--log-level {error|warn|info|debug|trace}`
+  * CLI: `lowell uki inspect /path/to/vmlinuz.efi`
+  * Flags: `--format human|json|json-pretty`, `--verbose`, global `--log-level {error|warn|info|debug|trace}`
   * Reports:
     * `arch`, `pe32_plus`
     * Signature presence and `cert_count`
@@ -29,8 +29,8 @@ Still under early active development:
 
 * **Planned next**
 
-  * `lowell inject uki` — modify initramfs and rebuild a UKI
-  * `lowell build` — hermetic initramfs + UKI, using OCI-pinned inputs where it helps
+  * `lowell uki inject` — modify initramfs and rebuild a UKI
+  * `lowell uki build` — hermetic initramfs + UKI, using OCI-pinned inputs where it helps
 
 ## Documentation
 
@@ -107,7 +107,7 @@ Thanks for considering a contribution! Bug reports, docs, tests, and features ar
 just build            # or: cargo build --release
 
 # run the CLI
-target/release/lowell inspect uki --file /path/to/vmlinuz.efi
+target/release/lowell uki inspect /path/to/vmlinuz.efi
 
 # format, lint, test (pre-PR checklist)
 cargo fmt --all