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=3.1
+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=('6d1397919270cccdc19b75b09cd3b01163c996962c82826737729a84e7d858fd')
+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

@@ -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" && printf '%s' "$body" > "$file"
-    notify-send "$title" "$body"
 }
 
 # 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=()
@@ -103,8 +105,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)
+    # (installed, or already built into your repo but not yet installed).
-    if (( $(vercmp "$stock_ver" "$custom_ver") > 0 )); then
+    # 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 +138,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 timeout 30 fwupdmgr get-updates --no-metadata-check </dev/null >/dev/null 2>&1; then
-        if (( $? == 0 )); 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
+Type=oneshot
-Restart=no

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