Make RPM package verifier diagnostic

Author: mdheller

packaging/scripts/verify-rpm-package.sh

@@ -5,6 +5,19 @@ repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
 tmp="$(mktemp -d)"
 trap 'rm -rf "$tmp"' EXIT
 
+require_line() {
+  pattern="$1"
+  file="$2"
+  label="$3"
+  if ! grep -q "$pattern" "$file"; then
+    echo "missing expected RPM path: $label" >&2
+    echo "expected pattern: $pattern" >&2
+    echo "available paths:" >&2
+    cat "$file" >&2
+    exit 1
+  fi
+}
+
 mkdir -p "$repo_root/target/release"
 for binary in wezterm wezterm-gui wezterm-mux-server; do
   cat > "$repo_root/target/release/$binary" <<'EOF'
@@ -17,6 +30,7 @@ done
 rpm="$(TURTLE_TERM_OUT_DIR="$tmp" TURTLE_TERM_VERSION="0.1.0" TURTLE_TERM_RPM_ARCH="$(uname -m)" \
   "$repo_root/packaging/scripts/build-rpm-package.sh")"
 contents="$tmp/rpm-contents.txt"
+payload="$tmp/rpm-payload.cpio"
 extract="$tmp/extract"
 
 test -f "$rpm"
@@ -42,22 +56,23 @@ rpm -qp --queryformat '%{VERSION}\n' "$rpm" | grep -qx '0.1.0'
 rpm -qpl "$rpm" > "$contents"
 
 for command in turtleterm turtle-agentctl turtle-agent-status turtle-cloudfog turtle-superconscious turtle-agent-machine turtle-language turtle-session; do
-  grep -q "^/usr/bin/$command$" "$contents"
+  require_line "^/usr/bin/$command$" "$contents" "/usr/bin/$command"
 done
 
-grep -q '^/etc/turtle-term/turtleterm.lua$' "$contents"
-grep -q '^/usr/share/applications/ai.sourceos.TurtleTerm.desktop$' "$contents"
-grep -q '^/usr/share/metainfo/ai.sourceos.TurtleTerm.metainfo.xml$' "$contents"
-grep -q '^/usr/share/icons/hicolor/scalable/apps/ai.sourceos.TurtleTerm.svg$' "$contents"
-grep -q '^/usr/libexec/turtle-term/wezterm-gui$' "$contents"
+require_line '^/etc/turtle-term/turtleterm.lua$' "$contents" '/etc/turtle-term/turtleterm.lua'
+require_line '^/usr/share/applications/ai.sourceos.TurtleTerm.desktop$' "$contents" '/usr/share/applications/ai.sourceos.TurtleTerm.desktop'
+require_line '^/usr/share/metainfo/ai.sourceos.TurtleTerm.metainfo.xml$' "$contents" '/usr/share/metainfo/ai.sourceos.TurtleTerm.metainfo.xml'
+require_line '^/usr/share/icons/hicolor/scalable/apps/ai.sourceos.TurtleTerm.svg$' "$contents" '/usr/share/icons/hicolor/scalable/apps/ai.sourceos.TurtleTerm.svg'
+require_line '^/usr/libexec/turtle-term/wezterm-gui$' "$contents" '/usr/libexec/turtle-term/wezterm-gui'
 
 if grep -q '^/usr/bin/wezterm-gui$' "$contents"; then
   echo 'private runtime leaked onto product PATH in rpm' >&2
   exit 1
 fi
 
 mkdir -p "$extract"
-(cd "$extract" && rpm2cpio "$rpm" | cpio -idmu >/dev/null 2>&1)
+rpm2cpio "$rpm" > "$payload"
+(cd "$extract" && cpio -idmu < "$payload" >/dev/null 2>&1)
 grep -q 'TURTLE_TERM_RUNTIME_DIR="/usr/libexec/turtle-term"' "$extract/usr/bin/turtleterm"
 grep -q 'TURTLETERM_CONFIG="/etc/turtle-term/turtleterm.lua"' "$extract/usr/bin/turtleterm"
 grep -q 'exec "/usr/libexec/turtle-term/turtleterm"' "$extract/usr/bin/turtleterm"