diff --git a/PKGBUILD b/PKGBUILD index 48b3ada..e1e6640 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: David Thurstenson pkgbase=tl-archconfig -pkgname=("tl-dmesg-unrestrict" "tl-pacdiff-hook" "tl-reflector-hook" "tl-steamdummy") -pkgver=1 +pkgname=("tl-dmesg-unrestrict" "tl-pacdiff-hook" "tl-reflector-config" "tl-steamdummy") +pkgver=2 pkgrel=1 pkgdesc="Thurstylark's system-level tweaks for Arch Linux" arch=(any) @@ -10,13 +10,11 @@ license=('GPL') groups=(tlconfig) source=("tl-dmesg-unrestrict.conf" "tl-pacdiff.hook" - "tl-reflector.hook" "tl-reflector.service.override.conf" "tl-reflector.conf" ) sha256sums=('0ccede1887575ae52e57824dd53cd9f65cf13b249a3757097e9c06dc16ac535e' 'fa4010aefe4ed06d623d5915ed70442c263c41a5eb72014b1084210d4db33ed5' - '167201c316f9cfabd84fb375c7ee21dcf9c211895b6693053def8c87e27508e1' '7801aaf6d28d0bf5f7b8c0e35e04af7201f3178b3b4af07a48a36ab4d1e8d7f1' 'ffe8c4f0928ffd70d05b3ca04d87f8181aa21214cc62fb4dd71a3753c2a788d0') @@ -34,12 +32,12 @@ package_tl-pacdiff-hook() { install -Dm644 tl-pacdiff.hook ${pkgdir}/usr/share/libalpm/hooks/pacdiff.hook } -package_tl-reflector-hook() { - pkgdesc="A hook to run reflector after an upgrade to pacman-mirrorlist, plus reflector config" +package_tl-reflector-config() { + pkgdesc="Thurstylark's config for reflector" depends=('reflector') - - install -Dm644 tl-reflector.hook \ - ${pkgdir}/usr/share/libalpm/hooks/tl-reflector.hook + install="tl-reflector-config.install" + conflicts=('tl-reflector-hook') + replaces=('tl-reflector-hook') install -Dm644 tl-reflector.service.override.conf \ ${pkgdir}/etc/systemd/system/reflector.service.d/override.conf diff --git a/tl-reflector-config.install b/tl-reflector-config.install new file mode 100644 index 0000000..1d15d42 --- /dev/null +++ b/tl-reflector-config.install @@ -0,0 +1,4 @@ +post_install() { + # Start the reflector service's timer + systemctl enable --now reflector.timer +} diff --git a/tl-reflector.hook b/tl-reflector.hook deleted file mode 100644 index f642850..0000000 --- a/tl-reflector.hook +++ /dev/null @@ -1,12 +0,0 @@ -# Shamelessly copied from https://wiki.archlinux.org/index.php/Reflector#pacman_hook -[Trigger] -Operation = Upgrade -Type = Package -Target = pacman-mirrorlist -Target = tl-reflector-hook - -[Action] -Description = Updating pacman-mirrorlist with reflector and removing pacnew... -When = PostTransaction -Depends = reflector -Exec = /bin/sh -c 'systemctl start reflector.service; if [ -f /etc/pacman.d/mirrorlist.pacnew ]; then rm /etc/pacman.d/mirrorlist.pacnew; fi'