mirror of
https://github.com/arthur-pbty/arthur-os.git
synced 2026-08-01 20:28:16 +02:00
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.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user