From a481c1784690bc18d5a70018bf03a5cf80edb1c0 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Thu, 21 May 2026 00:39:49 -0400 Subject: [PATCH] Drop install/packaging/fonts.sh, fix omarchy-setup-lock exit code fonts.sh: obsolete. omarchy-settings installs omarchy.ttf to /usr/share/fonts/omarchy/ system-wide and the fontconfig package's post-install hook updates the cache, so copying it to ~/.local/share/ fonts and re-running fc-cache is redundant. The script was also failing because omarchy-settings explicitly removes the source path /usr/share/omarchy/config/omarchy.ttf during package install. omarchy-setup-lock: the final line was 'omarchy-shell lock status >/dev/null && echo "..."' which inherits the failed exit code when omarchy-shell can't reach a running shell (always the case during chroot install). set -e exempts cmd1 of && from triggering, but the script still returns that non-zero as its own exit code, which the install wrapper treated as a script failure. Wrap in an if/then so a failed status check doesn't poison the script's exit code. --- bin/omarchy-setup-lock | 7 ++++++- install/packaging/all.sh | 1 - install/packaging/fonts.sh | 4 ---- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 install/packaging/fonts.sh diff --git a/bin/omarchy-setup-lock b/bin/omarchy-setup-lock index e8969682..cd10e376 100755 --- a/bin/omarchy-setup-lock +++ b/bin/omarchy-setup-lock @@ -59,4 +59,9 @@ else fi -omarchy-shell lock status >/dev/null 2>&1 && echo "Lock screen authentication configured." +# omarchy-shell can't reach a running shell during chroot install. The echo +# is just confirmation, so swallow the failure rather than letting it become +# the script's exit code. +if omarchy-shell lock status >/dev/null 2>&1; then + echo "Lock screen authentication configured." +fi diff --git a/install/packaging/all.sh b/install/packaging/all.sh index 87bf21c7..2da52bd8 100644 --- a/install/packaging/all.sh +++ b/install/packaging/all.sh @@ -1,4 +1,3 @@ -run_logged $OMARCHY_INSTALL/packaging/fonts.sh run_logged $OMARCHY_INSTALL/packaging/nvim.sh run_logged $OMARCHY_INSTALL/packaging/icons.sh run_logged $OMARCHY_INSTALL/packaging/webapps.sh diff --git a/install/packaging/fonts.sh b/install/packaging/fonts.sh deleted file mode 100644 index c2796314..00000000 --- a/install/packaging/fonts.sh +++ /dev/null @@ -1,4 +0,0 @@ -# Omarchy logo glyphs as a font (used by the omarchy-shell bar's left module) -mkdir -p ~/.local/share/fonts -cp $OMARCHY_PATH/config/omarchy.ttf ~/.local/share/fonts/ -fc-cache