diff --git a/bin/omarchy-dev-pkg-test b/bin/omarchy-dev-pkg-test index d835e167..a82b87de 100755 --- a/bin/omarchy-dev-pkg-test +++ b/bin/omarchy-dev-pkg-test @@ -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" diff --git a/bin/omarchy-update-system-pkgs b/bin/omarchy-update-system-pkgs index fbd52f5d..285e0e1b 100755 --- a/bin/omarchy-update-system-pkgs +++ b/bin/omarchy-update-system-pkgs @@ -30,4 +30,5 @@ sudo pacman -Syyu --noconfirm \ --overwrite '/etc/systemd/system/user@.service.d/10-faster-shutdown.conf' \ --overwrite '/etc/systemd/system/docker.service.d/no-block-boot.conf' \ --overwrite '/etc/systemd/system/plocate-updatedb.service.d/ac-only.conf' \ - --overwrite '/usr/lib/systemd/system-sleep/unmount-fuse' + --overwrite '/usr/lib/systemd/system-sleep/unmount-fuse' \ + --overwrite '/usr/share/plymouth/themes/omarchy/*'