omarchy-dev-pkg-test: install with pacman -U --overwrite=*; add plymouth to transition overwrites

Two related fixes for installing package builds onto a system that has
the legacy script-installed Omarchy files already in place:

bin/omarchy-dev-pkg-test: split makepkg -s (build) from sudo pacman -U
(install) so we can pass --overwrite='*' to pacman. makepkg -i forwards
a fixed flag set to pacman and doesn't expose --overwrite, so dev pkg
tests on an existing script-install fail on every conflicting file
(plymouth themes, /etc drop-ins, sudoers). --overwrite='*' is correct
for the dev use case: the build IS the new authoritative state.

bin/omarchy-update-system-pkgs: add /usr/share/plymouth/themes/omarchy/*
to the transition --overwrite list. The old install/login/plymouth.sh
cp -r'd the theme files into that directory, so existing installs
conflict on the omarchy-settings package's plymouth payload.
This commit is contained in:
Ryan Hughes
2026-06-04 18:34:35 -04:00
parent ac452dd311
commit 9e1ed8f85c
2 changed files with 15 additions and 2 deletions
+13 -1
View File
@@ -63,4 +63,16 @@ echo " PKGBUILD : $PKGBUILD_DIR/PKGBUILD"
echo
cd "$build_dir"
OMARCHY_SRC="$CHECKOUT" makepkg -si --skipchecksums --noconfirm "${@:3}"
OMARCHY_SRC="$CHECKOUT" makepkg -s --skipchecksums --noconfirm "${@:3}"
# Install separately so we can pass --overwrite='*' to pacman. In dev mode
# the package commonly conflicts with files left behind by previous
# script-installed Omarchy versions (plymouth themes, /etc drop-ins,
# sudoers, etc.). makepkg -i forwards a fixed set of flags to pacman and
# doesn't expose --overwrite.
built_pkg=$(ls -t "$build_dir"/*.pkg.tar.* 2>/dev/null | grep -v '\.sig$' | head -1)
if [[ -z $built_pkg ]]; then
echo "Error: no built package found in $build_dir" >&2
exit 1
fi
sudo pacman -U --noconfirm --overwrite='*' "$built_pkg"