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

@@ -2,36 +2,27 @@
 
 # Maintainer: Daniele Fucini <dfucini [at] gmail [dot] com>
 
-pkgname=update-notify-git
-_pkgname=update-notify
-pkgdesc='Notify when updates are available'
-pkgver=0.0.1
+pkgname=update-notify
+pkgver=3.2
 pkgrel=1
-url="https://github.com/Fuxino/${_pkgname}"
+pkgdesc='Notify when updates are available'
 arch=('any')
+url="https://git.shouldnt.work/fuxino/${pkgname}"
 license=('GPL-3.0-or-later')
-makedepends=('git')
 depends=('pacman-contrib'
-         'aurutils')
-source=(git+${url}.git?signed#branch=master)
+         'libnotify')
+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')
+source=(git+${url}?signed#tag=${pkgver})
 validpgpkeys=('7E12BC1FF3B6EDB2CD8053EB981A2B2A3BBF5514')
-sha256sums=('SKIP')
-
-pkgver() 
-{  
-    cd ${_pkgname}
-    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare()
-{
-    git -C ${srcdir}/${_pkgname} clean -dfx
-}
+sha256sums=('a81613c3098c9af6dabe1da67f26efeee4d0753352e38ba4c0ee1d7e86f7d2d7')
 
 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"
 }

update-notify

@@ -1,16 +1,159 @@
 #!/bin/bash
+set -u
 
-if [ "$#" -eq 1 ]; then
-    threshold=$1
+# ---------------------------------------------------------------------------
+# Config
+# ---------------------------------------------------------------------------
+threshold=${1:-30}
+AUR_REPO="aur-local"
+# stock kernel package -> your custom build of it. Add or remove entries freely.
+declare -A KERNELS=(
+    [linux]="linux-custom"
+    [linux-lts]="linux-lts-custom"
+    [linux-zen]="linux-zen-custom"
+)
+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
+export DBUS_SESSION_BUS_ADDRESS="${DBUS_SESSION_BUS_ADDRESS:-unix:path=/run/user/$(id -u)/bus}"
+
+# ---------------------------------------------------------------------------
+# 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() {
+    local pkg=$1 item new
+    for item in "${arch_list[@]}"; do
+        if [[ $item == "$pkg "* ]]; then
+            read -r _ _ _ new <<< "$item"
+            printf '%s\n' "$new"
+            return 0
+        fi
+    done
+    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
+# ---------------------------------------------------------------------------
+
+# Fetch checkupdates once. Exit codes: 0 = updates, 2 = none, 1 = error.
+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=()
+if [[ -n $checkupdates_out ]]; then
+    mapfile -t arch_list <<< "$checkupdates_out"
+fi
+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)
+fi
+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]}
+
+    # Skip kernels where either package isn't installed
+    if ! stock_ver=$(latest_version "$stock_pkg") || ! custom_ver=$(latest_version "$custom_pkg"); then
+        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
+done
+
+# ---------------------------------------------------------------------------
+# Build a single notification
+#   - kernel rebuild lines are always included
+#   - update counts and reminders only when the threshold is reached
+# ---------------------------------------------------------------------------
+over_threshold=0
+(( updates >= threshold )) && over_threshold=1
+
+parts=()
+if (( over_threshold )); then
+    parts+=("Arch: $arch_updates, AUR: $aur_updates")
+fi
+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
-    threshold=30
-fi
-
-arch_updates=$(checkupdates | wc -l)
-aur_updates=$(aur repo -u -d aur-local | wc -l)
-
-updates=$(($arch_updates + $aur_updates))
-
-if [ "$updates" -ge "$threshold" ]; then
-    notify-send "Updates available" "Arch: $arch_updates, AUR: $aur_updates"
+    clear_state "updates"
 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