ZacharyZhang-NY/omarchycn
3
4
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Remove unused cups-browsed install override

Browse Source
This commit is contained in:
Ryan Hughes
2026-08-29 14:24:05 -04:00
parent 1dbc7d5bce
commit bb5b178e5f
3 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/post-install/pacman.sh
+2 -13
View File
@@ -3,22 +3,11 @@
cp -f "$OMARCHY_PATH/default/pacman/pacman-${OMARCHY_MIRROR:-stable}.conf" /etc/pacman.conf
cp -f "$OMARCHY_PATH/default/pacman/mirrorlist-${OMARCHY_MIRROR:-stable}" /etc/pacman.d/mirrorlist
# Each override waits for the package that owns the file it replaces, the way
# omarchy-settings does, so pacman does not turn it into a .pacnew during ISO
# package installation.
# Wait for CUPS to own the file, the way omarchy-settings does, so pacman does
# not turn the override into a .pacnew during ISO package installation.
if [[ -f $OMARCHY_PATH/etc-overrides/cups-cups-files.conf && -f /etc/cups/cups-files.conf ]]; then
install -m 0640 -o root -g cups "$OMARCHY_PATH/etc-overrides/cups-cups-files.conf" /etc/cups/cups-files.conf
rm -f /etc/cups/cups-files.conf.pacnew
fi
# cups-browsed is no longer part of the default install, so this waits for a
# machine that adds discovery back by hand. Writing the override before then
# would leave a configuration file for a package nothing installed, and pacman
# would later land the package's own copy beside it as a .pacnew.
if [[ -f $OMARCHY_PATH/etc-overrides/cups-cups-browsed.conf && -f /etc/cups/cups-browsed.conf ]]; then
systemd-sysusers /etc/sysusers.d/omarchy-cups-browsed.conf
cp -f "$OMARCHY_PATH/etc-overrides/cups-cups-browsed.conf" /etc/cups/cups-browsed.conf
rm -f /etc/cups/cups-browsed.conf.pacnew
fi
source "$OMARCHY_INSTALL/hardware/pacman.sh"