Add .pacnew and reboot reminders

Remind about files to merge with pacdiff and a reboot after the running kernel
was upgraded. They join every notification and notify alone only for new items;
PACNEW_CHECK/REBOOT_CHECK disable them, and the pending file gets pacnew/reboot lines.

PKGBUILD

@@ -3,7 +3,7 @@
 # Maintainer: Daniele Fucini <dfucini [at] gmail [dot] com>
 
 pkgname=update-notify
-pkgver=3.7
+pkgver=3.11.2
 pkgrel=1
 pkgdesc='Notify when updates are available'
 arch=('any')
@@ -17,17 +17,16 @@ optdepends=('aurutils: to check AUR packages in the local repo for updates'
             'git-monitor: to check git repos for updates')
 source=("git+$url?signed#tag=$pkgver")
 validpgpkeys=('7E12BC1FF3B6EDB2CD8053EB981A2B2A3BBF5514')
-sha256sums=('89ffddcb3fc0b82fdaec61defb374127d720655c35f2157cfe0d543360df22ab')
+sha256sums=('1a3859f3c9d3bbcd46c59ccc728f6ffa9a1d162df940bcd31e2b5753a40324f4')
 
 package()
 {
     cd "$srcdir"/"$pkgname"
     install -Dm755 "$pkgname" "$pkgdir"/usr/bin/"$pkgname"
     install -Dm644 "$pkgname".service "$pkgdir"/usr/lib/systemd/user/"$pkgname".service
+    install -Dm644 "$pkgname"-quiet.service "$pkgdir"/usr/lib/systemd/user/"$pkgname"-quiet.service
     install -Dm644 "$pkgname".timer "$pkgdir"/usr/lib/systemd/user/"$pkgname".timer
     install -Dm644 "$pkgname".path "$pkgdir"/usr/lib/systemd/user/"$pkgname".path
-    install -Dm755 "$pkgname"-refresh "$pkgdir"/usr/lib/"$pkgname"/refresh
-    install -Dm644 "$pkgname".hook "$pkgdir"/usr/share/libalpm/hooks/"$pkgname".hook
     install -Dm644 README.md "$pkgdir"/usr/share/doc/"$pkgname"/README.md
     install -Dm644 config.example "$pkgdir"/usr/share/doc/"$pkgname"/config.example
 }

README.md

@@ -7,11 +7,13 @@ update-notify runs on a systemd user timer and checks:
 - **Repo updates**, using `checkupdates` from pacman-contrib.
 - **AUR updates** for packages in a local aurutils repository (`aur repo -u`).
 - **Custom kernel rebuilds**: when a stock kernel (e.g. `linux-lts`) has a newer version than your custom build of it (e.g. `linux-lts-custom`).
+- **Maintenance**: `.pacnew`/`.pacsave` files to merge (`pacdiff -o`), and a reboot after the running kernel was upgraded.
 
 It sends one notification, and only when its content changes since the last one:
 
-- Update counts are shown once the total number of updates reaches a threshold (default 30). Reminders for `git-monitor` and pending firmware updates (`fwupdmgr`) are added when those tools are installed, and one to run `trustsight` before building pending AUR updates.
+- Update counts are shown once the total number of updates reaches a threshold (default 30). Reminders for `git-monitor` and pending firmware updates (`fwupdmgr`) are added when those tools are installed.
 - Kernel rebuild reminders are always shown, even below the threshold.
+- Maintenance reminders are added to every notification. On their own, they notify only when something new appears (a new file to merge, a new kernel to reboot into), so a `.pacnew` you keep isn't repeated.
 
 ## Requirements
 
@@ -23,17 +25,16 @@ Optional:
 - `aurutils`: check AUR packages in the local repository
 - `fwupd`: check for firmware updates
 - `git-monitor`: remind to check git packages
-- `trustsight`: remind to vet AUR updates before building them
 
 ## Installation
 
-Build and install the package with the included PKGBUILD:
+Build and install the package with the included PKGBUILD, which builds the signed release tag set in `pkgver`:
 
 ```
 makepkg -si
 ```
 
-Or, with aurutils, build it into your local repository with `aur build` and install it with pacman.
+Or, with aurutils, build it into a local repository with `aur build` and install it with pacman.
 
 Then enable the timer:
 
@@ -43,11 +44,9 @@ systemctl --user enable --now update-notify.timer
 
 The timer runs 5 minutes after boot, then every 6 hours.
 
-A pacman hook also runs update-notify after every pacman transaction, for each logged-in user whose timer is active, so the notification and the status bar file are current right after an upgrade.
-
 ### Refresh after building packages
 
-Building into a local repository (`aur build`, `aur sync`) doesn't run pacman, so the hook can't catch it. To run update-notify whenever a repository changes, add the repository files to watch to `update-notify.path`:
+To run `update-notify --quiet` whenever a repository changes, add the repository files to watch to `update-notify.path`:
 
 ```
 systemctl --user edit update-notify.path
@@ -68,10 +67,12 @@ systemctl --user enable --now update-notify.path
 ## Usage
 
 ```
-update-notify [threshold]
+update-notify [-q|--quiet] [threshold]
 ```
 
-`threshold` is the minimum number of updates (repo + AUR) before update counts are shown. It overrides the `THRESHOLD` setting below.
+`threshold` is the minimum number of updates (repo + AUR) before update counts are shown. It overrides the `THRESHOLD` setting below for that run's notification only; the pending file keeps the configured value.
+
+`--quiet` updates the pending file without notifying. Changes to a notification already shown are recorded, so the next timer run doesn't repeat them; a new notification is left for the timer. `update-notify.path` uses it (through `update-notify-quiet.service`), so building many packages doesn't notify after each one.
 
 ## Configuration
 
@@ -80,6 +81,8 @@ Settings are read from `$XDG_CONFIG_HOME/update-notify/config` (default `~/.conf
 - `THRESHOLD`: minimum number of updates before update counts are shown (default 30).
 - `AUR_REPO`: name of the local aurutils repository (default `aur-local`).
 - `KERNELS`: maps each stock kernel package to its custom build (default: `linux`, `linux-lts` and `linux-zen` to `<name>-custom`). Kernels where either package isn't installed are skipped. Set `KERNELS=()` to disable the kernel check.
+- `PACNEW_CHECK`: set to `0` to disable the `.pacnew`/`.pacsave` reminder (default `1`).
+- `REBOOT_CHECK`: set to `0` to disable the reboot reminder (default `1`). A reboot is needed when the running kernel's `/usr/lib/modules/<version>/vmlinuz` is gone.
 
 A commented sample config is installed with the package. To start from it:
 
@@ -97,13 +100,15 @@ The content of the last notification is stored in `$XDG_STATE_HOME/update-notify
 Each run also writes the pending updates to `$XDG_STATE_HOME/update-notify/pending`, whether or not the threshold is reached, for status bars such as xmobar to read:
 
 ```
-threshold 30
+threshold <THRESHOLD from the config, not the argument>
 repo <pkg> <newver>
 aur <pkg> <newver>
 kernel <custom-pkg> <stock-ver>
+pacnew <path>
+reboot <running kernel version>
 ```
 
-The file reflects the last run, which the pacman hook and `update-notify.path` keep close to current. To keep a bar current in between, drop entries whose installed version (`pacman -Q`) is no longer older than `newver`, or, for `kernel` lines, whose custom build has caught up with `stock-ver` (ignoring `pkgrel`). This only reads local data, so it's cheap to run often.
+The file reflects the last timer or `update-notify.path` run. To keep a bar current in between, e.g. right after an upgrade, drop entries whose installed version (`pacman -Q`) is no longer older than `newver`; for `kernel` lines, whose custom build has caught up with `stock-ver` (ignoring `pkgrel`); for `pacnew` lines, whose file is gone; for `reboot` lines, whose version is no longer `uname -r`. This only reads local data, so it's cheap to run often.
 
 ## License
 

config.example

@@ -17,3 +17,9 @@
 #    [linux-lts]="linux-lts-custom"
 #    [linux-zen]="linux-zen-custom"
 #)
+
+# Remind about .pacnew/.pacsave files to merge with pacdiff (0 to disable).
+#PACNEW_CHECK=1
+
+# Remind to reboot after the running kernel was upgraded (0 to disable).
+#REBOOT_CHECK=1

update-notify

@@ -12,6 +12,8 @@ declare -A KERNELS=(
     [linux-lts]="linux-lts-custom"
     [linux-zen]="linux-zen-custom"
 )
+PACNEW_CHECK=1  # remind about .pacnew/.pacsave files (0 to disable)
+REBOOT_CHECK=1  # remind to reboot after a kernel upgrade (0 to disable)
 config_file="${XDG_CONFIG_HOME:-$HOME/.config}/update-notify/config"
 state_dir="${XDG_STATE_HOME:-$HOME/.local/state}/update-notify"
 
@@ -19,10 +21,20 @@ if [[ -r $config_file ]]; then
     # shellcheck source=/dev/null
     source "$config_file"
 fi
+quiet=0  # refresh the pending file without notifying (path unit)
+if [[ ${1:-} == -q || ${1:-} == --quiet ]]; then
+    quiet=1
+    shift
+fi
+config_threshold=$THRESHOLD  # written to the pending file, so a one-off argument doesn't change status bars
 THRESHOLD=${1:-$THRESHOLD}
 
-[[ $THRESHOLD =~ ^[0-9]+$ ]] || { echo "Threshold must be a number" >&2; exit 1; }
+for t in "$config_threshold" "$THRESHOLD"; do
-THRESHOLD=$((10#$THRESHOLD))  # force base 10, so e.g. "08" isn't read as octal
+    [[ $t =~ ^[0-9]+$ ]] || { echo "Threshold must be a number" >&2; exit 1; }
+done
+# force base 10, so e.g. "08" isn't read as octal
+config_threshold=$((10#$config_threshold))
+THRESHOLD=$((10#$THRESHOLD))
 mkdir -p "$state_dir"
 
 # notify-send from cron/systemd needs the session bus address
@@ -32,21 +44,6 @@ export DBUS_SESSION_BUS_ADDRESS="${DBUS_SESSION_BUS_ADDRESS:-unix:path=/run/user
 # Helpers
 # ---------------------------------------------------------------------------
 
-# Send a notification only if its body changed since last time for this key.
-notify_once() {
-    local key=$1 title=$2 body=$3
-    local file="$state_dir/$key"
-    if [[ -f $file && $(<"$file") == "$body" ]]; then
-        return 0
-    fi
-    notify-send "$title" "$body" && printf '%s' "$body" > "$file"
-}
-
-# Forget a key so the next occurrence notifies again.
-clear_state() {
-    rm -f "$state_dir/$1"
-}
-
 # If $1 has a pending update, print its new version and return 0.
 # checkupdates lines look like: "pkgname oldver -> newver"
 pending_version() {
@@ -126,11 +123,31 @@ for stock_pkg in "${!KERNELS[@]}"; do
     fi
 done
 
+# ---------------------------------------------------------------------------
+# Maintenance: config files to merge, reboot after a kernel upgrade.
+# maint_items are tracked in the state and the pending file, maint_lines are shown.
+# ---------------------------------------------------------------------------
+maint_items=()
+maint_lines=()
+if [[ $PACNEW_CHECK != 0 ]]; then
+    mapfile -t pacnew_files < <(pacdiff -o 2>/dev/null)
+    if (( ${#pacnew_files[@]} )); then
+        maint_items+=("${pacnew_files[@]/#/pacnew }")
+        maint_lines+=("Config files to merge with pacdiff: ${#pacnew_files[@]}")
+    fi
+fi
+running_kernel=$(uname -r)
+# vmlinuz belongs to the kernel package, while DKMS files can keep the folder around
+if [[ $REBOOT_CHECK != 0 && ! -e /usr/lib/modules/$running_kernel/vmlinuz ]]; then
+    maint_items+=("reboot $running_kernel")
+    maint_lines+=("Reboot to load the new kernel (running $running_kernel)")
+fi
+
 # ---------------------------------------------------------------------------
 # Pending list for status bars, one "<source> <pkg> <newver>" per line
 # ---------------------------------------------------------------------------
 {
-    printf 'threshold %s\n' "$THRESHOLD"
+    printf 'threshold %s\n' "$config_threshold"
     for item in "${arch_list[@]}"; do
         read -r pkg _ _ new <<< "$item"
         printf 'repo %s %s\n' "$pkg" "$new"
@@ -142,6 +159,9 @@ done
     for item in "${kernel_pending[@]}"; do
         printf 'kernel %s\n' "$item"
     done
+    for item in "${maint_items[@]}"; do
+        printf '%s\n' "$item"
+    done
 } > "$state_dir/pending.tmp" && mv "$state_dir/pending.tmp" "$state_dir/pending"  # readers never see a partial file
 
 # ---------------------------------------------------------------------------
@@ -175,22 +195,72 @@ if (( over_threshold )); then
         fi
     fi
 
-    # Vet AUR changes before building them
-    if (( aur_updates )) && command -v trustsight >/dev/null 2>&1; then
-        parts+=("Before aur sync: trustsight review --repo $AUR_REPO")
-    fi
-
     if (( ${#reminders[@]} )); then
         printf -v list '%s, ' "${reminders[@]}"
         parts+=("Also check: ${list%, }")
     fi
 fi
 
+# ---------------------------------------------------------------------------
+# Notify when the update part changed since the last notification (maintenance
+# lines included), or for maintenance alone when it has items not shown before
+# ---------------------------------------------------------------------------
+main_file="$state_dir/updates"
+main_body=""
+main_changed=0
 if (( ${#parts[@]} )); then
+    printf -v main_body '%s\n' "${parts[@]}"
+    main_body=${main_body%$'\n'}
+    [[ -f $main_file && $(<"$main_file") == "$main_body" ]] || main_changed=1
+else
+    rm -f "$main_file"  # so the next occurrence notifies again
+fi
+
+maint_file="$state_dir/maintenance"
+declare -A maint_seen=()
+if [[ -f $maint_file ]]; then
+    while IFS= read -r item; do
+        maint_seen["$item"]=1
+    done < "$maint_file"
+fi
+maint_new=0
+maint_kept=()  # current items already shown
+for item in "${maint_items[@]}"; do
+    if [[ -n ${maint_seen["$item"]:-} ]]; then
+        maint_kept+=("$item")
+    else
+        maint_new=1
+    fi
+done
+
+lines=()
+if (( main_changed )); then
+    lines=("${parts[@]}" "${maint_lines[@]}")
     title="Updates available"
     (( over_threshold )) || title="Kernel update available"
-    printf -v body '%s\n' "${parts[@]}"
+elif (( maint_new )); then
-    notify_once "updates" "$title" "${body%$'\n'}"
+    lines=("${maint_lines[@]}")
-else
+    title="System maintenance"
-    clear_state "updates"
+fi
+
+shown=0
+if (( ${#lines[@]} )); then
+    printf -v body '%s\n' "${lines[@]}"
+    if (( quiet )); then
+        # Track changes to a shown notification, so the timer doesn't re-notify them;
+        # leave a new one for the timer to show
+        (( main_changed )) && [[ -f $main_file ]] && printf '%s' "$main_body" > "$main_file"
+    elif notify-send "$title" "${body%$'\n'}"; then
+        shown=1
+        [[ -n $main_body ]] && printf '%s' "$main_body" > "$main_file"
+    fi
+fi
+
+# Remember the maintenance items shown: drop resolved ones, keep new ones for the next notification
+maint_save=("${maint_kept[@]}")
+(( shown )) && maint_save=("${maint_items[@]}")
+if (( ${#maint_save[@]} )); then
+    printf '%s\n' "${maint_save[@]}" > "$maint_file"
+else
+    rm -f "$maint_file"
 fi

update-notify-quiet.service

@@ -0,0 +1,6 @@
+[Unit]
+Description=Refresh the update-notify pending file without notifying
+
+[Service]
+ExecStart=/usr/bin/update-notify --quiet
+Type=oneshot

update-notify-refresh

@@ -1,10 +0,0 @@
-#!/bin/bash
-# Run update-notify for every logged-in user whose timer is active (called by the pacman hook as root)
-systemctl list-units --plain --no-legend --state=running 'user@*.service' |
-while read -r unit _; do
-    uid=${unit#user@}
-    uid=${uid%.service}
-    user=$(id -nu "$uid") || continue
-    systemctl --user -M "$user@" is-active --quiet update-notify.timer || continue
-    systemctl --user -M "$user@" start --no-block update-notify.service
-done

update-notify.hook

@@ -1,11 +0,0 @@
-[Trigger]
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Type = Package
-Target = *
-
-[Action]
-Description = Refreshing update-notify...
-When = PostTransaction
-Exec = /usr/lib/update-notify/refresh

update-notify.path

@@ -4,7 +4,7 @@ Description=Run update-notify when a local repository changes
 # Add the repository files to watch with: systemctl --user edit update-notify.path
 # e.g. PathChanged=/home/aur-local/aur-local.db.tar.gz.sig
 [Path]
-Unit=update-notify.service
+Unit=update-notify-quiet.service
 
 [Install]
 WantedBy=default.target