Clean up systemd units

Use Type=oneshot for the service and drop the default Restart=no.
Remove Persistent=true from the timer, which only applies to
OnCalendar= timers.

PKGBUILD

@@ -3,24 +3,26 @@
 # Maintainer: Daniele Fucini <dfucini [at] gmail [dot] com>
 
 pkgname=update-notify
-pkgver=2.0
+pkgver=3.2
 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=('e96dbcc2b77750be03d89cdf3e1351c20c9079b7de1e129da0188dd3b30f6a03')
+sha256sums=('a81613c3098c9af6dabe1da67f26efeee4d0753352e38ba4c0ee1d7e86f7d2d7')
 
 package()
 {
-    cd ${srcdir}/${pkgname}
+    cd "${srcdir}/${pkgname}"
-    install -Dm755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
+    install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 ${pkgname}.service ${pkgdir}/usr/lib/systemd/user/${pkgname}.service
+    install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/user/${pkgname}.service"
-    install -Dm644 ${pkgname}.timer ${pkgdir}/usr/lib/systemd/user/${pkgname}.timer
+    install -Dm644 "${pkgname}.timer" "${pkgdir}/usr/lib/systemd/user/${pkgname}.timer"
 }

update-notify

@@ -12,9 +12,10 @@ declare -A KERNELS=(
     [linux-lts]="linux-lts-custom"
     [linux-zen]="linux-zen-custom"
 )
-state_dir="${XDG_STATE_HOME:-$HOME/.local/state}/check-updates"
+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" && printf '%s' "$body" > "$file"
-    notify-send "$title" "$body"
 }
 
 # Forget a key so the next occurrence notifies again.
@@ -54,6 +54,19 @@ pending_version() {
     return 1
 }
 
+# Newest known version of $1: the pending version if an update is queued,
+# otherwise the installed version. Returns 1 if the package isn't installed.
+latest_version() {
+    local pkg=$1 ver
+    if ver=$(pending_version "$pkg"); then
+        printf '%s\n' "$ver"
+    elif ver=$(pacman -Q "$pkg" 2>/dev/null); then
+        printf '%s\n' "${ver#* }"
+    else
+        return 1
+    fi
+}
+
 # ---------------------------------------------------------------------------
 # Gather updates
 # ---------------------------------------------------------------------------
@@ -62,7 +75,9 @@ pending_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=()
@@ -80,38 +95,65 @@ updates=$((arch_updates + aur_updates))
 # ---------------------------------------------------------------------------
 # Kernel check: the stock kernel updated, but your custom build didn't
 # ---------------------------------------------------------------------------
+kernel_lines=()
 for stock_pkg in "${!KERNELS[@]}"; do
     custom_pkg=${KERNELS[$stock_pkg]}
 
-    # Only relevant if the custom kernel is installed and has no pending update itself
+    # Skip kernels where either package isn't installed
-    if pacman -Q "$custom_pkg" >/dev/null 2>&1 && ! pending_version "$custom_pkg" >/dev/null; then
+    if ! stock_ver=$(latest_version "$stock_pkg") || ! custom_ver=$(latest_version "$custom_pkg"); then
-        if stock_ver=$(pending_version "$stock_pkg"); then
-            notify_once "kernel-$stock_pkg" "Kernel update available: $stock_pkg" \
-                "Rebuild $custom_pkg ($stock_pkg $stock_ver)"
         continue
     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).
+    # 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
-    clear_state "kernel-$stock_pkg"
 done
 
 # ---------------------------------------------------------------------------
-# General updates threshold
+# Build a single notification
+#   - kernel rebuild lines are always included
+#   - update counts and reminders only when the threshold is reached
 # ---------------------------------------------------------------------------
-if (( updates >= threshold )); then
+over_threshold=0
-    notify_once "updates" "Updates available" "Arch: $arch_updates, AUR: $aur_updates"
+(( updates >= threshold )) && over_threshold=1
 
-    hints=(
+parts=()
-        "git-monitor|Check git packages|Use git-monitor for git packages updates"
+if (( over_threshold )); then
-        "fwupdmgr|Check firmware|Use fwupdmgr to check for firmware updates"
+    parts+=("Arch: $arch_updates, AUR: $aur_updates")
-    )
-    for hint in "${hints[@]}"; do
-        IFS='|' read -r cmd title body <<< "$hint"
-        if command -v "$cmd" >/dev/null 2>&1; then
-            notify_once "hint-$cmd" "$title" "$body"
 fi
-    done
+parts+=("${kernel_lines[@]}")
+
+if (( over_threshold )); then
+    reminders=()
+
+    # Always remind about git packages if git-monitor is installed
+    if command -v git-monitor >/dev/null 2>&1; then
+        reminders+=("git-monitor")
+    fi
+
+    # Firmware: only mention it when updates actually exist.
+    # 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
+        if timeout 30 fwupdmgr get-updates --no-metadata-check </dev/null >/dev/null 2>&1; then
+            reminders+=("fwupdmgr (firmware updates available)")
+        fi
+    fi
+
+    if (( ${#reminders[@]} )); then
+        printf -v list '%s, ' "${reminders[@]}"
+        parts+=("Also check: ${list%, }")
+    fi
+fi
+
+if (( ${#parts[@]} )); then
+    title="Updates available"
+    (( over_threshold )) || title="Kernel update available"
+    printf -v body '%s\n' "${parts[@]}"
+    notify_once "updates" "$title" "${body%$'\n'}"
 else
     clear_state "updates"
-    clear_state "hint-git-monitor"
-    clear_state "hint-fwupdmgr"
 fi

update-notify.service

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

update-notify.timer

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