Ryan Hughes
9e1ed8f85c
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.
35 lines
1.6 KiB
Bash
Executable File
35 lines
1.6 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# omarchy:summary=Update system packages with pacman
|
|
# omarchy:requires-sudo=true
|
|
|
|
set -e
|
|
|
|
echo -e "\e[32m\nUpdate system packages\e[0m"
|
|
|
|
# Transition --overwrite: the Omarchy 4 package refactor moves files that
|
|
# previous Omarchy installs wrote as unowned files (via install scripts) into
|
|
# the omarchy-settings package. Pacman would otherwise refuse to install
|
|
# omarchy-settings on the first upgrade because the paths "exist in
|
|
# filesystem". Limited to the exact paths the package now owns; remove the
|
|
# corresponding --overwrite entry once the transition release is everyone's
|
|
# baseline.
|
|
sudo pacman -Syyu --noconfirm \
|
|
--overwrite '/etc/docker/daemon.json' \
|
|
--overwrite '/etc/gnupg/dirmngr.conf' \
|
|
--overwrite '/etc/modprobe.d/omarchy-usb-autosuspend.conf' \
|
|
--overwrite '/etc/sudoers.d/omarchy-asdcontrol' \
|
|
--overwrite '/etc/sudoers.d/omarchy-passwd-tries' \
|
|
--overwrite '/etc/sudoers.d/omarchy-tzupdate' \
|
|
--overwrite '/etc/sysctl.d/90-omarchy-file-watchers.conf' \
|
|
--overwrite '/etc/sysctl.d/99-omarchy-sysctl.conf' \
|
|
--overwrite '/etc/systemd/logind.conf.d/10-ignore-power-button.conf' \
|
|
--overwrite '/etc/systemd/resolved.conf.d/10-disable-multicast.conf' \
|
|
--overwrite '/etc/systemd/resolved.conf.d/20-docker-dns.conf' \
|
|
--overwrite '/etc/systemd/system.conf.d/10-faster-shutdown.conf' \
|
|
--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/share/plymouth/themes/omarchy/*'
|