ZacharyZhang-NY/omarchycn
4
5
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Harden Firefox policy dirs even when the theme refresh fails

Browse Source
This commit is contained in:
Ryan Hughes
2026-08-28 19:00:03 -04:00
parent 5925929cb6
commit 6b10dbf191
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
migrations/1787515927.sh
+4 -1
View File
@@ -9,8 +9,11 @@ for dir in "${BROWSER_POLICY_MANAGED_DIRS[@]}"; do
repaired=1 repaired=1
done done
# Repainting the policy color is cosmetic and the next theme change redoes it.
# Under bash -euo pipefail a failure here would abort the migration before the
# Firefox directories below are hardened, and the marker would never be written.
if (( repaired )); then if (( repaired )); then
omarchy-theme-set-browser omarchy-theme-set-browser || true
fi fi
for dir in "${BROWSER_POLICY_FIREFOX_DIRS[@]}"; do for dir in "${BROWSER_POLICY_FIREFOX_DIRS[@]}"; do
test/shell.d/browser-policy-dir-test.sh
+4
View File
@@ -294,6 +294,10 @@ cleanup || fail "omarchy-theme-set-browser-policy's EXIT trap succeeds with a st
unset -f cleanup unset -f cleanup
pass "omarchy-theme-set-browser-policy's EXIT trap never leaks a failure status" pass "omarchy-theme-set-browser-policy's EXIT trap never leaks a failure status"
grep -F 'omarchy-theme-set-browser || true' "$ROOT/migrations/1787515927.sh" >/dev/null ||
fail "the policy-directory migration hardens Firefox even when the theme refresh fails"
pass "the policy-directory migration does not abort on a failed theme refresh"
policy_files=( policy_files=(
"$ROOT/bin/omarchy-install-browser" "$ROOT/bin/omarchy-install-browser"
"$ROOT/bin/omarchy-provision-owner" "$ROOT/bin/omarchy-provision-owner"