Merge all notifications

Notification for kernel update is included in the same notification as
everything else, no more a separate one

PKGBUILD

@@ -3,7 +3,7 @@
 # Maintainer: Daniele Fucini <dfucini [at] gmail [dot] com>
 
 pkgname=update-notify
-pkgver=3.0.2
+pkgver=3.1
 pkgrel=1
 pkgdesc='Notify when updates are available'
 arch=('any')
@@ -15,7 +15,7 @@ makedepends=('git')
 optdepends=('git-monitor: to check git repos for updates')
 source=(git+${url}?signed#tag=${pkgver})
 validpgpkeys=('7E12BC1FF3B6EDB2CD8053EB981A2B2A3BBF5514')
-sha256sums=('3541f7b27a48316ba6cf7acb243cb50ae024ff139a39837ab78cb0ec9007efcd')
+sha256sums=('6d1397919270cccdc19b75b09cd3b01163c996962c82826737729a84e7d858fd')
 
 package()
 {

update-notify

@@ -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
 # ---------------------------------------------------------------------------
@@ -80,24 +93,37 @@ 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)
+    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
+(( 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
@@ -115,13 +141,17 @@ if (( updates >= threshold )); then
         fi
     fi
 
-    body="Arch: $arch_updates, AUR: $aur_updates"
     if (( ${#reminders[@]} )); then
         printf -v list '%s, ' "${reminders[@]}"
-        body+=$'\n'"Also check: ${list%, }"
+        parts+=("Also check: ${list%, }")
     fi
+fi
 
-    notify_once "updates" "Updates available" "$body"
+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"
 fi