Menu: flip the switches without asking for a keypress

Toggling automatic updates or notifications returned to a 'press any key'
prompt for no reason - the status block at the top of the menu already shows
the new state. cau_bad and cau_note now flag that they printed something, so
the acknowledgement only appears when there is genuinely something to read
(a failed sudoers check, a missing AUR helper) instead of after every toggle.

Makefile

@@ -5,7 +5,10 @@
 # targets degrade to a no-op when msgfmt/scdoc are missing, so the tree stays
 # usable for development without the build dependencies installed.
 
-VERSION      := 1.0.0
+# 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.0.4
 
 PREFIX       ?= /usr
 DESTDIR      ?=

po/cachy-auto-update.pot

@@ -134,7 +134,7 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-msgid "Press Enter to continue..."
+msgid "Press any key to continue..."
 msgstr ""
 
 #. Commands

po/de.po

@@ -135,8 +135,8 @@ msgstr "Aktuelle Bedingungen anzeigen"
 msgid "Quit"
 msgstr "Beenden"
 
-msgid "Press Enter to continue..."
+msgid "Press any key to continue..."
-msgstr "Zum Fortfahren Enter drücken …"
+msgstr "Zum Fortfahren eine Taste drücken …"
 
 #. Commands
 msgid "Automatic updates are on."

src/cachy-auto-update

@@ -170,7 +170,9 @@ cau_do_status() {
 
 cau_do_run() {
 	cau_need_root
-	exec "$CAU_LIBEXECDIR/cachy-auto-update-run" "$@"
+	# Not exec'd: this is also called from the menu, which has to survive the
+	# run and redraw afterwards.
+	"$CAU_LIBEXECDIR/cachy-auto-update-run" "$@"
 }
 
 cau_do_log() {

src/cachy-auto-update-run

@@ -40,6 +40,13 @@ if [[ $EUID -ne 0 ]]; then
 	exit 2
 fi
 
+# Force a neutral locale here rather than relying on the unit's Environment=,
+# so a run started by hand behaves exactly like one started by the timer.
+# pacman failures are classified by matching its output, and on a German system
+# that output is German. Text aimed at a person does not come through here - a
+# notification is rendered in the recipient's own locale by cau_msg_in.
+export LC_ALL=C LANGUAGE=
+
 # Re-exec under an inhibitor so a suspend or shutdown cannot land in the middle
 # of a pacman transaction and leave the database half-written. Done before
 # anything else so the whole pass is covered, including the lock.

src/lib/common.sh

@@ -146,11 +146,18 @@ cau_run_logged() {
 # Terminal helpers for the CLI
 # ---------------------------------------------------------------------------
 
+# Set by cau_bad and cau_note. The menu redraws immediately after an action,
+# which would wipe the screen; this marks that something was printed that the
+# user still has to read, so only those cases wait for a keypress. A plain
+# success needs no acknowledgement - the status block at the top of the menu
+# already shows the new state.
+CAU_UI_NEEDS_ACK=''
+
 cau_say()  { printf '%s\n' "$*"; }
 cau_head() { printf '\n%s%s%s\n\n' "$CAU_C_BOLD$CAU_C_BLUE" "$*" "$CAU_C_RESET"; }
 cau_ok()   { printf '%s✔%s %s\n' "$CAU_C_GREEN" "$CAU_C_RESET" "$*"; }
-cau_bad()  { printf '%s✘%s %s\n' "$CAU_C_RED" "$CAU_C_RESET" "$*" >&2; }
+cau_bad()  { CAU_UI_NEEDS_ACK=1; printf '%s✘%s %s\n' "$CAU_C_RED" "$CAU_C_RESET" "$*" >&2; }
-cau_note() { printf '%s•%s %s\n' "$CAU_C_DIM" "$CAU_C_RESET" "$*"; }
+cau_note() { CAU_UI_NEEDS_ACK=1; printf '%s•%s %s\n' "$CAU_C_DIM" "$CAU_C_RESET" "$*"; }
 
 # ---------------------------------------------------------------------------
 # State files

src/lib/menu.sh

@@ -145,31 +145,49 @@ cau_ui_menu() {
 		printf '  [q] %s\n' "$(cau_msg "Quit")"
 		printf '\n  > '
 
-		read -r choice || { printf '\n'; return 0; }
+		# One keypress, no Enter. -s keeps the raw character out of the
+		# display so the echo below is the only thing printed, and a failing
+		# read means EOF (Ctrl-D, or a script piping input) - that quits.
+		read -rsn1 choice || { printf '\n'; return 0; }
+		printf '%s\n' "$choice"
 
 		case "$choice" in
+			# The two switches flip and return straight to the menu, where the
+			# status block shows the result. Only a warning or an error holds
+			# the screen (see CAU_UI_NEEDS_ACK).
 			1)
+				CAU_UI_NEEDS_ACK=''
 				if [[ $CFG_ENABLED == yes ]]; then cau_do_disable; else cau_do_enable; fi
-				cau_pause
+				if [[ -n $CAU_UI_NEEDS_ACK ]]; then cau_pause; fi
 				;;
 			2)
+				CAU_UI_NEEDS_ACK=''
 				if [[ $CFG_NOTIFICATIONS == yes ]]; then
 					cau_do_notifications off
 				else
 					cau_do_notifications on
 				fi
-				cau_pause
+				if [[ -n $CAU_UI_NEEDS_ACK ]]; then cau_pause; fi
 				;;
 			3) cau_do_run --force; cau_pause ;;
 			4) cau_do_log; cau_pause ;;
 			5) cau_ui_status_conditions; cau_pause ;;
-			q|Q|'') return 0 ;;
+			q|Q) return 0 ;;
+			$'\e')
+				# Arrow keys and friends arrive as ESC [ X. Swallow the rest so
+				# one keypress does not redraw the menu three times. Escape is
+				# deliberately not a quit key: that would make a stray arrow
+				# key close the menu.
+				read -rsn2 -t 0.05 _ 2>/dev/null || true
+				;;
+			# Anything else, Enter included, just redraws.
 			*) ;;
 		esac
 	done
 }
 
 cau_pause() {
-	printf '\n  %s' "$(cau_msg "Press Enter to continue...")"
+	printf '\n  %s' "$(cau_msg "Press any key to continue...")"
-	read -r _ || true
+	read -rsn1 _ || true
+	printf '\n'
 }

src/lib/pkg_pacman.sh

@@ -76,9 +76,16 @@ cau_pacman_update() {
 		return 0
 	fi
 
+	if [[ -n $CAU_PACMAN_PENDING ]]; then
 		CAU_PACMAN_COUNT="$(grep -c . <<< "$CAU_PACMAN_PENDING")"
 		[[ $CAU_PACMAN_COUNT =~ ^[0-9]+$ ]] || CAU_PACMAN_COUNT=0
 		cau_info "Updating $CAU_PACMAN_COUNT repository package(s)"
+	else
+		# checkupdates is unavailable, so the list is unknown and pacman is
+		# asked to work it out itself.
+		CAU_PACMAN_COUNT=0
+		cau_info "Running a full system upgrade (pending list unavailable)"
+	fi
 
 	mapfile -t flags < <(cau_pacman_flags)
 	log="$(mktemp)" || return 1