Stop pipefail from turning grep -q SIGPIPE exits into false negatives (#6614)
* Stop pipefail from turning grep -q SIGPIPE exits into false negatives grep -q exits at the first match, and when the producer is still writing it dies with SIGPIPE. Under pipefail that 141 becomes the pipeline's status, so hardware checks like lspci | grep -q read as "not found" on exactly the machines they target. The T2 defaults migration hit this and silently skipped real T2 Macs (#6608). Redirect grep to /dev/null instead of -q wherever a pipeline feeds grep in a pipefail context, so grep reads all input and the producer never gets killed. The install-time T2 checks aren't run under pipefail today but are switched too, since they're the same detection line the issue calls out. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Re-run the T2 defaults migration its broken hardware check skipped The SIGPIPE bug marked 1785944594 as applied without doing anything on affected T2 Macs. The original migration is idempotent, so a fresh migration can just source it now that the guard is fixed. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Address Copilot review: fix OCR grep pipeline and prove the T2 repair screen_contains piped tesseract into grep -Fqi under the acceptance suite's pipefail, the same SIGPIPE false negative the rest of the branch fixes. The T2 test's lspci stub now keeps writing past the pipe buffer after the match so every scenario exercises the SIGPIPE case, and a new case runs the rerun migration against fixtures a bitten install would have. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Fable 5
parent
667d2d2f31
commit
b85ae70ebd
@@ -40,7 +40,7 @@ screen_contains() {
|
||||
rm -f "$snapshot"
|
||||
return 1
|
||||
fi
|
||||
tesseract "$snapshot" stdout --psm 11 2>/dev/null | grep -Fqi -- "$text"
|
||||
tesseract "$snapshot" stdout --psm 11 2>/dev/null | grep -Fi -- "$text" >/dev/null
|
||||
local status=$?
|
||||
rm -f "$snapshot"
|
||||
return $status
|
||||
|
||||
@@ -76,7 +76,7 @@ done <<<"$panels"
|
||||
# The power widget intentionally disappears on desktops and VMs without a
|
||||
# battery. Exercise it on laptops, and verify that hardware-less sessions take
|
||||
# the supported no-panel path instead of treating that as a shell failure.
|
||||
if upower -e | grep -q '/battery_'; then
|
||||
if upower -e | grep '/battery_' >/dev/null; then
|
||||
if ! (trap - EXIT; open_and_capture_panel "power" "omarchy.power"); then
|
||||
status=1
|
||||
hide_panels
|
||||
|
||||
Reference in New Issue
Block a user