Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7c1bdfd4dd
|
||
|
|
b5e1395468
|
||
|
|
15bc29d890
|
||
|
|
bcffe942d4
|
||
|
|
a20b93a1e5
|
||
|
|
10b84b771e
|
||
|
|
69450e4a3c
|
||
|
|
41f94d719b
|
||
|
|
bd34dd7bf1
|
||
|
|
ffb15c0954
|
||
|
|
da8505624f
|
||
|
|
5a4baddcdb
|
||
|
|
ebc19057ea
|
||
|
|
7b30b24715
|
||
|
|
e0059e490c
|
||
|
|
4dc9a268a6
|
||
|
|
954c5d5264
|
||
|
|
8c94be5a08
|
||
|
|
aca5a0213e
|
||
|
|
3ebded0476
|
@@ -0,0 +1 @@
|
||||
CLAUDE.md
|
||||
@@ -3,26 +3,31 @@
|
||||
# Maintainer: Daniele Fucini <dfucini [at] gmail [dot] com>
|
||||
|
||||
pkgname=update-notify
|
||||
pkgver=3.3
|
||||
pkgver=3.11.1
|
||||
pkgrel=1
|
||||
pkgdesc='Notify when updates are available'
|
||||
arch=('any')
|
||||
url="https://git.shouldnt.work/fuxino/${pkgname}"
|
||||
url="https://git.shouldnt.work/fuxino/$pkgname"
|
||||
license=('GPL-3.0-or-later')
|
||||
depends=('pacman-contrib'
|
||||
'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})
|
||||
'git-monitor: to check git repos for updates'
|
||||
'trustsight: to vet AUR updates before building them')
|
||||
source=("git+$url?signed#tag=$pkgver")
|
||||
validpgpkeys=('7E12BC1FF3B6EDB2CD8053EB981A2B2A3BBF5514')
|
||||
sha256sums=('413435ce9215cf6e37f9a11e69aba7d6338489547a552a6977f4f283da9402c2')
|
||||
sha256sums=('09fa8cbde71ae801166852add9f8f43b52fa0ee4c3fe8c94636d61c51523283e')
|
||||
|
||||
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"-quiet.service "$pkgdir"/usr/lib/systemd/user/"$pkgname"-quiet.service
|
||||
install -Dm644 "$pkgname".timer "$pkgdir"/usr/lib/systemd/user/"$pkgname".timer
|
||||
install -Dm644 "$pkgname".path "$pkgdir"/usr/lib/systemd/user/"$pkgname".path
|
||||
install -Dm644 README.md "$pkgdir"/usr/share/doc/"$pkgname"/README.md
|
||||
install -Dm644 config.example "$pkgdir"/usr/share/doc/"$pkgname"/config.example
|
||||
}
|
||||
|
||||
@@ -26,13 +26,13 @@ Optional:
|
||||
|
||||
## Installation
|
||||
|
||||
Build and install the package with the included PKGBUILD:
|
||||
Build and install the package with the included PKGBUILD, which builds the signed release tag set in `pkgver`:
|
||||
|
||||
```
|
||||
makepkg -si
|
||||
```
|
||||
|
||||
Or, with aurutils, build it into your local repository with `aur build` and install it with pacman.
|
||||
Or, with aurutils, build it into a local repository with `aur build` and install it with pacman.
|
||||
|
||||
Then enable the timer:
|
||||
|
||||
@@ -42,39 +42,68 @@ systemctl --user enable --now update-notify.timer
|
||||
|
||||
The timer runs 5 minutes after boot, then every 6 hours.
|
||||
|
||||
### Refresh after building packages
|
||||
|
||||
To run `update-notify --quiet` whenever a repository changes, add the repository files to watch to `update-notify.path`:
|
||||
|
||||
```
|
||||
systemctl --user edit update-notify.path
|
||||
```
|
||||
|
||||
```
|
||||
[Path]
|
||||
PathChanged=/home/aur-local/aur-local.db.tar.gz.sig
|
||||
PathChanged=/home/custom-pkgs/custom-pkgs.db.tar.gz.sig
|
||||
```
|
||||
|
||||
Watch the `.db.tar.gz.sig` file for signed repositories, or `.db.tar.gz` for unsigned ones (`.db` is a symlink). Then enable it:
|
||||
|
||||
```
|
||||
systemctl --user enable --now update-notify.path
|
||||
```
|
||||
|
||||
## Usage
|
||||
|
||||
```
|
||||
update-notify [threshold]
|
||||
update-notify [-q|--quiet] [threshold]
|
||||
```
|
||||
|
||||
`threshold` is the minimum number of updates (repo + AUR) before update counts are shown. The default is 30.
|
||||
`threshold` is the minimum number of updates (repo + AUR) before update counts are shown. It overrides the `THRESHOLD` setting below for that run's notification only; the pending file keeps the configured value.
|
||||
|
||||
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
|
||||
```
|
||||
`--quiet` updates the pending file without notifying. Changes to a notification already shown are recorded, so the next timer run doesn't repeat them; a new notification is left for the timer. `update-notify.path` uses it (through `update-notify-quiet.service`), so building many packages doesn't notify after each one.
|
||||
|
||||
## Configuration
|
||||
|
||||
These settings are at the top of the script:
|
||||
Settings are read from `$XDG_CONFIG_HOME/update-notify/config` (default `~/.config/update-notify/config`), a bash file that is sourced by the script. All settings are optional:
|
||||
|
||||
- `THRESHOLD`: minimum number of updates before update counts are shown (default 30).
|
||||
- `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.
|
||||
- `KERNELS`: maps each stock kernel package to its custom build (default: `linux`, `linux-lts` and `linux-zen` to `<name>-custom`). Kernels where either package isn't installed are skipped. Set `KERNELS=()` to disable the kernel check.
|
||||
|
||||
Changes to the installed script are overwritten on upgrade, so change them in the source and rebuild the package.
|
||||
A commented sample config is installed with the package. To start from it:
|
||||
|
||||
```
|
||||
mkdir -p ~/.config/update-notify
|
||||
cp /usr/share/doc/update-notify/config.example ~/.config/update-notify/config
|
||||
```
|
||||
|
||||
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.
|
||||
|
||||
## Status bars
|
||||
|
||||
Each run also writes the pending updates to `$XDG_STATE_HOME/update-notify/pending`, whether or not the threshold is reached, for status bars such as xmobar to read:
|
||||
|
||||
```
|
||||
threshold <THRESHOLD from the config, not the argument>
|
||||
repo <pkg> <newver>
|
||||
aur <pkg> <newver>
|
||||
kernel <custom-pkg> <stock-ver>
|
||||
```
|
||||
|
||||
The file reflects the last timer or `update-notify.path` run. To keep a bar current in between, e.g. right after an upgrade, drop entries whose installed version (`pacman -Q`) is no longer older than `newver`, or, for `kernel` lines, whose custom build has caught up with `stock-ver` (ignoring `pkgrel`). This only reads local data, so it's cheap to run often.
|
||||
|
||||
## License
|
||||
|
||||
GPL-3.0-or-later. See [LICENSE](LICENSE).
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
# update-notify configuration, sourced as bash.
|
||||
# Copy to ~/.config/update-notify/config and uncomment what you want to change.
|
||||
# The values shown are the defaults.
|
||||
|
||||
# Minimum number of updates (repo + AUR) before update counts are shown.
|
||||
# The command-line argument takes precedence.
|
||||
#THRESHOLD=30
|
||||
|
||||
# Name of the local aurutils repository.
|
||||
#AUR_REPO="aur-local"
|
||||
|
||||
# Stock kernel package -> your custom build of it. Replaces the whole list;
|
||||
# kernels where either package isn't installed are skipped.
|
||||
# Set KERNELS=() to disable the kernel check.
|
||||
#KERNELS=(
|
||||
# [linux]="linux-custom"
|
||||
# [linux-lts]="linux-lts-custom"
|
||||
# [linux-zen]="linux-zen-custom"
|
||||
#)
|
||||
+52
-8
@@ -2,20 +2,37 @@
|
||||
set -u
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Config
|
||||
# Config: defaults, overridden by the config file, then by the argument
|
||||
# ---------------------------------------------------------------------------
|
||||
threshold=${1:-30}
|
||||
THRESHOLD=30
|
||||
AUR_REPO="aur-local"
|
||||
# stock kernel package -> your custom build of it. Add or remove entries freely.
|
||||
# stock kernel package -> your custom build of it
|
||||
declare -A KERNELS=(
|
||||
[linux]="linux-custom"
|
||||
[linux-lts]="linux-lts-custom"
|
||||
[linux-zen]="linux-zen-custom"
|
||||
)
|
||||
config_file="${XDG_CONFIG_HOME:-$HOME/.config}/update-notify/config"
|
||||
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
|
||||
if [[ -r $config_file ]]; then
|
||||
# shellcheck source=/dev/null
|
||||
source "$config_file"
|
||||
fi
|
||||
quiet=0 # refresh the pending file without notifying (path unit)
|
||||
if [[ ${1:-} == -q || ${1:-} == --quiet ]]; then
|
||||
quiet=1
|
||||
shift
|
||||
fi
|
||||
config_threshold=$THRESHOLD # written to the pending file, so a one-off argument doesn't change status bars
|
||||
THRESHOLD=${1:-$THRESHOLD}
|
||||
|
||||
for t in "$config_threshold" "$THRESHOLD"; do
|
||||
[[ $t =~ ^[0-9]+$ ]] || { echo "Threshold must be a number" >&2; exit 1; }
|
||||
done
|
||||
# force base 10, so e.g. "08" isn't read as octal
|
||||
config_threshold=$((10#$config_threshold))
|
||||
THRESHOLD=$((10#$THRESHOLD))
|
||||
mkdir -p "$state_dir"
|
||||
|
||||
# notify-send from cron/systemd needs the session bus address
|
||||
@@ -32,6 +49,12 @@ notify_once() {
|
||||
if [[ -f $file && $(<"$file") == "$body" ]]; then
|
||||
return 0
|
||||
fi
|
||||
if (( quiet )); then
|
||||
# Track changes to a shown notification, so the timer doesn't re-notify them;
|
||||
# leave a new one for the timer to show
|
||||
[[ -f $file ]] && printf '%s' "$body" > "$file"
|
||||
return 0
|
||||
fi
|
||||
notify-send "$title" "$body" && printf '%s' "$body" > "$file"
|
||||
}
|
||||
|
||||
@@ -86,20 +109,22 @@ if [[ -n $checkupdates_out ]]; then
|
||||
fi
|
||||
arch_updates=${#arch_list[@]}
|
||||
|
||||
aur_updates=0
|
||||
aur_list=()
|
||||
if command -v aur >/dev/null 2>&1; then
|
||||
if aur_out=$(aur repo -u -d "$AUR_REPO"); then
|
||||
[[ -n $aur_out ]] && aur_updates=$(wc -l <<< "$aur_out")
|
||||
[[ -n $aur_out ]] && mapfile -t aur_list <<< "$aur_out"
|
||||
else
|
||||
echo "aur repo -u failed, AUR updates not counted" >&2
|
||||
fi
|
||||
fi
|
||||
aur_updates=${#aur_list[@]}
|
||||
updates=$((arch_updates + aur_updates))
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Kernel check: the stock kernel updated, but your custom build didn't
|
||||
# ---------------------------------------------------------------------------
|
||||
kernel_lines=()
|
||||
kernel_pending=()
|
||||
for stock_pkg in "${!KERNELS[@]}"; do
|
||||
custom_pkg=${KERNELS[$stock_pkg]}
|
||||
|
||||
@@ -113,16 +138,35 @@ for stock_pkg in "${!KERNELS[@]}"; do
|
||||
# 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)")
|
||||
kernel_pending+=("$custom_pkg $stock_ver")
|
||||
fi
|
||||
done
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Pending list for status bars, one "<source> <pkg> <newver>" per line
|
||||
# ---------------------------------------------------------------------------
|
||||
{
|
||||
printf 'threshold %s\n' "$config_threshold"
|
||||
for item in "${arch_list[@]}"; do
|
||||
read -r pkg _ _ new <<< "$item"
|
||||
printf 'repo %s %s\n' "$pkg" "$new"
|
||||
done
|
||||
for item in "${aur_list[@]}"; do
|
||||
read -r pkg _ _ new <<< "$item"
|
||||
printf 'aur %s %s\n' "$pkg" "$new"
|
||||
done
|
||||
for item in "${kernel_pending[@]}"; do
|
||||
printf 'kernel %s\n' "$item"
|
||||
done
|
||||
} > "$state_dir/pending.tmp" && mv "$state_dir/pending.tmp" "$state_dir/pending" # readers never see a partial file
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# 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
|
||||
(( updates >= THRESHOLD )) && over_threshold=1
|
||||
|
||||
parts=()
|
||||
if (( over_threshold )); then
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
[Unit]
|
||||
Description=Refresh the update-notify pending file without notifying
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/update-notify --quiet
|
||||
Type=oneshot
|
||||
@@ -0,0 +1,10 @@
|
||||
[Unit]
|
||||
Description=Run update-notify when a local repository changes
|
||||
|
||||
# Add the repository files to watch with: systemctl --user edit update-notify.path
|
||||
# e.g. PathChanged=/home/aur-local/aur-local.db.tar.gz.sig
|
||||
[Path]
|
||||
Unit=update-notify-quiet.service
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
@@ -2,5 +2,5 @@
|
||||
Description=Notify if updates are available
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/update-notify 30
|
||||
ExecStart=/usr/bin/update-notify
|
||||
Type=oneshot
|
||||
|
||||
Reference in New Issue
Block a user