Mention aur build in README

Print a warning instead of silently counting 0 AUR updates, and stop
discarding aur's stderr so the cause shows up in the journal.

PKGBUILD

@@ -3,24 +3,26 @@
 # Maintainer: Daniele Fucini <dfucini [at] gmail [dot] com>
 
 pkgname=update-notify
-pkgver=3.1
+pkgver=3.3
 pkgrel=1
 pkgdesc='Notify when updates are available'
 arch=('any')
 url="https://git.shouldnt.work/fuxino/${pkgname}"
 license=('GPL-3.0-or-later')
 depends=('pacman-contrib'
-         'aurutils')
+         'libnotify')
 makedepends=('git')
-optdepends=('git-monitor: to check git repos for updates')
+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')
 source=(git+${url}?signed#tag=${pkgver})
 validpgpkeys=('7E12BC1FF3B6EDB2CD8053EB981A2B2A3BBF5514')
-sha256sums=('6d1397919270cccdc19b75b09cd3b01163c996962c82826737729a84e7d858fd')
+sha256sums=('413435ce9215cf6e37f9a11e69aba7d6338489547a552a6977f4f283da9402c2')
 
 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}.timer ${pkgdir}/usr/lib/systemd/user/${pkgname}.timer
+    cd "${srcdir}/${pkgname}"
+    install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/user/${pkgname}.service"
+    install -Dm644 "${pkgname}.timer" "${pkgdir}/usr/lib/systemd/user/${pkgname}.timer"
 }

README.md

@@ -0,0 +1,80 @@
+# update-notify
+
+Desktop notifications for pending updates on Arch Linux.
+
+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`).
+
+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.
+- Kernel rebuild reminders are always shown, even below the threshold.
+
+## Requirements
+
+- `pacman-contrib`
+- `libnotify` and a running notification daemon
+
+Optional:
+
+- `aurutils`: check AUR packages in the local repository
+- `fwupd`: check for firmware updates
+- `git-monitor`: remind to check git packages
+
+## Installation
+
+Build and install the package with the included PKGBUILD:
+
+```
+makepkg -si
+```
+
+Or, with aurutils, build it into your local repository with `aur build` and install it with pacman.
+
+Then enable the timer:
+
+```
+systemctl --user enable --now update-notify.timer
+```
+
+The timer runs 5 minutes after boot, then every 6 hours.
+
+## Usage
+
+```
+update-notify [threshold]
+```
+
+`threshold` is the minimum number of updates (repo + AUR) before update counts are shown. The default is 30.
+
+To change the threshold used by the timer, override the service:
+
+```
+systemctl --user edit update-notify.service
+```
+
+```ini
+[Service]
+ExecStart=
+ExecStart=/usr/bin/update-notify 50
+```
+
+## Configuration
+
+These settings are at the top of the script:
+
+- `AUR_REPO`: name of the local aurutils repository (default `aur-local`).
+- `KERNELS`: maps each stock kernel package to its custom build. Kernels where either package isn't installed are skipped.
+
+Changes to the installed script are overwritten on upgrade, so change them in the source and rebuild the package.
+
+Kernel versions are compared without `pkgrel`, so a stock packaging-only update doesn't trigger a rebuild reminder. A custom build already in the local repository but not installed yet counts as up to date.
+
+The content of the last notification is stored in `$XDG_STATE_HOME/update-notify` (default `~/.local/state/update-notify`). Delete it to get the current notification again.
+
+## License
+
+GPL-3.0-or-later. See [LICENSE](LICENSE).

update-notify

@@ -15,6 +15,7 @@ declare -A KERNELS=(
 state_dir="${XDG_STATE_HOME:-$HOME/.local/state}/update-notify"
 
 [[ $threshold =~ ^[0-9]+$ ]] || { echo "Threshold must be a number" >&2; exit 1; }
+threshold=$((10#$threshold))  # force base 10, so e.g. "08" isn't read as octal
 mkdir -p "$state_dir"
 
 # notify-send from cron/systemd needs the session bus address
@@ -31,8 +32,7 @@ notify_once() {
     if [[ -f $file && $(<"$file") == "$body" ]]; then
         return 0
     fi
-    printf '%s' "$body" > "$file"
-    notify-send "$title" "$body"
+    notify-send "$title" "$body" && printf '%s' "$body" > "$file"
 }
 
 # Forget a key so the next occurrence notifies again.
@@ -75,7 +75,9 @@ latest_version() {
 checkupdates_out=$(checkupdates 2>/dev/null)
 checkupdates_rc=$?
 if (( checkupdates_rc == 1 )); then
+    # Bail out without touching the state, so the next good run doesn't re-notify
     echo "checkupdates failed (network or sync problem?)" >&2
+    exit 1
 fi
 
 arch_list=()
@@ -86,7 +88,11 @@ arch_updates=${#arch_list[@]}
 
 aur_updates=0
 if command -v aur >/dev/null 2>&1; then
-    aur_updates=$(aur repo -u -d "$AUR_REPO" 2>/dev/null | wc -l)
+    if aur_out=$(aur repo -u -d "$AUR_REPO"); then
+        [[ -n $aur_out ]] && aur_updates=$(wc -l <<< "$aur_out")
+    else
+        echo "aur repo -u failed, AUR updates not counted" >&2
+    fi
 fi
 updates=$((arch_updates + aur_updates))
 
@@ -103,8 +109,9 @@ for stock_pkg in "${!KERNELS[@]}"; do
     fi
 
     # Flag the kernel while the stock one is newer than the newest custom build
-    # (installed, or already built into your repo but not yet installed)
-    if (( $(vercmp "$stock_ver" "$custom_ver") > 0 )); then
+    # (installed, or already built into your repo but not yet installed).
+    # pkgrel is ignored: a stock packaging-only bump doesn't need a rebuild.
+    if (( $(vercmp "${stock_ver%-*}" "${custom_ver%-*}") > 0 )); then
         kernel_lines+=("Rebuild $custom_pkg ($stock_pkg $stock_ver)")
     fi
 done
@@ -135,8 +142,7 @@ if (( over_threshold )); then
     # fwupdmgr get-updates exits 0 when updates are available, 2 when there are none.
     # --no-metadata-check avoids prompting/refreshing; the fwupd-refresh timer keeps metadata fresh.
     if command -v fwupdmgr >/dev/null 2>&1; then
-        timeout 30 fwupdmgr get-updates --no-metadata-check </dev/null >/dev/null 2>&1
-        if (( $? == 0 )); then
+        if timeout 30 fwupdmgr get-updates --no-metadata-check </dev/null >/dev/null 2>&1; then
             reminders+=("fwupdmgr (firmware updates available)")
         fi
     fi

update-notify.service

@@ -3,5 +3,4 @@ Description=Notify if updates are available
 
 [Service]
 ExecStart=/usr/bin/update-notify 30
-Type=simple
-Restart=no
+Type=oneshot

update-notify.timer

@@ -4,7 +4,6 @@ Description=Run update-notify every 6 hours
 [Timer]
 OnBootSec=5min
 OnUnitActiveSec=6h
-Persistent=true
 
 [Install]
 WantedBy=timers.target