From a17aed4b3dfb881e782025c65462b1b69a14bf72 Mon Sep 17 00:00:00 2001 From: Felitendo Date: Sat, 8 Aug 2026 16:30:20 +0200 Subject: [PATCH] Lower the battery threshold to 30% and default the cachy-update prompt to yes The prompt offering to silence cachy-update's own update notification now defaults to yes: once updates install themselves that notification is nothing but noise, so the common answer should be the one you get by pressing Enter. It also accepts "j" now. The prompt is translated, so a German user reads "[J/n]" and types the German letter - which the old check for "y" alone silently read as a refusal. --- Makefile | 2 +- README.md | 2 +- po/cachy-auto-update.pot | 2 +- po/de.po | 4 ++-- res/config/cachy-auto-update.conf | 2 +- src/cachy-auto-update | 12 ++++++++++-- src/lib/config.sh | 2 +- src/lib/menu.sh | 2 +- 8 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 9c5fa22..43da8c4 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ # Overridable so a packager can pass the version it is actually building # (`make VERSION=$pkgver`). The literal below is the fallback for builds # straight from a checkout, and is what a release tag has to carry. -VERSION ?= 1.1.1 +VERSION ?= 1.1.2 PREFIX ?= /usr DESTDIR ?= diff --git a/README.md b/README.md index 12af6a6..ca8ae7b 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ deliberately. A run is postponed — and retried an hour later — when: -- the battery is below 40 % (ignored on mains power; desktops without a battery +- the battery is below 30 % (ignored on mains power; desktops without a battery are never affected), - a game is running: GameMode, a known game process, or anything holding a blocking idle inhibitor, diff --git a/po/cachy-auto-update.pot b/po/cachy-auto-update.pot index 6fb9f79..814a81d 100644 --- a/po/cachy-auto-update.pot +++ b/po/cachy-auto-update.pot @@ -168,7 +168,7 @@ msgstr "" msgid "base-devel is missing - AUR packages cannot be built without it." msgstr "" -msgid "cachy-update also notifies about available updates. Turn its notifications off? [y/N]" +msgid "cachy-update also notifies about available updates. Turn its notifications off? [Y/n]" msgstr "" msgid "cachy-update's update check has been disabled." diff --git a/po/de.po b/po/de.po index fa3c566..e73d0ef 100644 --- a/po/de.po +++ b/po/de.po @@ -169,8 +169,8 @@ msgstr "Kein AUR-Helper gefunden – für AUR-Updates paru oder yay installieren msgid "base-devel is missing - AUR packages cannot be built without it." msgstr "base-devel fehlt – ohne das lassen sich AUR-Pakete nicht bauen." -msgid "cachy-update also notifies about available updates. Turn its notifications off? [y/N]" -msgstr "cachy-update benachrichtigt ebenfalls über verfügbare Updates. Dessen Benachrichtigungen abschalten? [j/N]" +msgid "cachy-update also notifies about available updates. Turn its notifications off? [Y/n]" +msgstr "cachy-update benachrichtigt ebenfalls über verfügbare Updates. Dessen Benachrichtigungen abschalten? [J/n]" msgid "cachy-update's update check has been disabled." msgstr "Die Update-Prüfung von cachy-update wurde abgeschaltet." diff --git a/res/config/cachy-auto-update.conf b/res/config/cachy-auto-update.conf index 3493e68..339a661 100644 --- a/res/config/cachy-auto-update.conf +++ b/res/config/cachy-auto-update.conf @@ -31,7 +31,7 @@ UpdateInterval=1d # Never update while the battery is below this percentage. Ignored on mains # power and on machines without a battery. -MinBatteryPercent=40 +MinBatteryPercent=30 # Update only while plugged in. Stricter than MinBatteryPercent. RequireAC=no diff --git a/src/cachy-auto-update b/src/cachy-auto-update index 50b7e53..0e71b4f 100644 --- a/src/cachy-auto-update +++ b/src/cachy-auto-update @@ -117,9 +117,17 @@ cau_offer_disable_cachy_update() { (( found )) || return 0 printf '\n %s\n ' \ - "$(cau_msg "cachy-update also notifies about available updates. Turn its notifications off? [y/N]")" + "$(cau_msg "cachy-update also notifies about available updates. Turn its notifications off? [Y/n]")" read -r answer || return 0 - [[ ${answer,,} == y ]] || return 0 + + # Defaults to yes: once updates install themselves, cachy-update's "N + # updates available" is purely noise. "j" is accepted too - the prompt is + # translated, so a German user types the German letter and used to have + # that silently read as "no". + case "${answer,,}" in + ''|y|yes|j|ja) ;; + *) return 0 ;; + esac while read -r user uid; do [[ -n $user ]] || continue diff --git a/src/lib/config.sh b/src/lib/config.sh index ef32bd8..1c8b987 100644 --- a/src/lib/config.sh +++ b/src/lib/config.sh @@ -134,7 +134,7 @@ cau_config_load() { CFG_INTERVAL="$(cau_config_get UpdateInterval 1d)" CFG_INTERVAL_SECONDS="$(cau_duration_to_seconds "$CFG_INTERVAL" 86400)" - CFG_MIN_BATTERY="$(cau_config_int MinBatteryPercent 40)" + CFG_MIN_BATTERY="$(cau_config_int MinBatteryPercent 30)" CFG_KEEP_OLD="$(cau_config_int KeepOldPackages 3)" CFG_AUR_HELPER="$(cau_config_get AURHelper auto)" CFG_IGNORE_PKG="$(cau_config_get IgnorePkg '')" diff --git a/src/lib/menu.sh b/src/lib/menu.sh index 34626c3..ea50869 100644 --- a/src/lib/menu.sh +++ b/src/lib/menu.sh @@ -135,7 +135,7 @@ CAU_SETTINGS=( "UpdateInterval|choice:6h 12h 1d 2d 1w|1d|Time between update runs" "SkipWhenGaming|bool|yes|Postpone while a game is running" "RequireAC|bool|no|Only update on mains power" - "MinBatteryPercent|choice:0 20 30 40 50 60 70 80|40|Minimum battery level (%)" + "MinBatteryPercent|choice:0 20 30 40 50 60 70 80|30|Minimum battery level (%)" "UpdateAUR|bool|yes|Update AUR packages" "UpdateFlatpak|bool|yes|Update Flatpaks" "UpdateAppImages|bool|yes|Update AppImages"