Record trustsight reviews in the reminder

trustsight review is read-only by default, so each run compared only against the previous AUR commit instead of the last reviewed one.

PKGBUILD

@@ -3,7 +3,7 @@
 # Maintainer: Daniele Fucini <dfucini [at] gmail [dot] com>
 
 pkgname=update-notify
-pkgver=3.7
+pkgver=3.11
 pkgrel=1
 pkgdesc='Notify when updates are available'
 arch=('any')
@@ -14,20 +14,20 @@ depends=('pacman-contrib'
 makedepends=('git')
 optdepends=('aurutils: to check AUR packages in the local repo for updates'
             'fwupd: to check for firmware updates'
-            'git-monitor: to check git repos for updates')
+            'git-monitor: to check git repos for updates'
+            'trustsight: to vet AUR updates before building them')
 source=("git+$url?signed#tag=$pkgver")
 validpgpkeys=('7E12BC1FF3B6EDB2CD8053EB981A2B2A3BBF5514')
-sha256sums=('89ffddcb3fc0b82fdaec61defb374127d720655c35f2157cfe0d543360df22ab')
+sha256sums=('d298653e424465665d34896eee38f9e5cc6a1da6e319915011fa00106eac0a2e')
 
 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

@@ -43,11 +43,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 +66,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
 
@@ -97,13 +97,13 @@ 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>
 ```
 
-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`, 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.
 
 ## License
 

update-notify

@@ -19,10 +19,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
@@ -39,6 +49,12 @@ notify_once() {
     if [[ -f $file && $(<"$file") == "$body" ]]; then
         return 0
     fi
+    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
+        [[ -f $file ]] && printf '%s' "$body" > "$file"
+        return 0
+    fi
     notify-send "$title" "$body" && printf '%s' "$body" > "$file"
 }
 
@@ -130,7 +146,7 @@ done
 # 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"
@@ -177,7 +193,7 @@ if (( over_threshold )); then
 
     # 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")
+        parts+=("Before aur sync: trustsight review --record --repo $AUR_REPO")
     fi
 
     if (( ${#reminders[@]} )); then

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