Skip to content

Restore keymap option validation and GRUB build-all safeguards #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
assisted-by-ai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Restore keymap option validation and GRUB build-all safeguards #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
210 changes: 210 additions & 0 deletions changelog.upstream
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,213 @@
commit f5d60eac9499286ec87b5b03e9c09d57c8f0a41d
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 09:34:44 2025 -0500

fix

commit 1fab149a1f7c0a748c9f16ea007825eaa868d40c
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 14:27:15 2025 +0000

bumped changelog version

commit f18894375d89b4bbaf26dacfdaade6b403223248
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 09:21:00 2025 -0500

fix

commit 2b112f1b1d37c230aa4af1a24dc7c37600d0d4b5
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 09:19:54 2025 -0500

fix

commit 8a7e2880398b2aa493f8786adacb9fa9fb33d4b6
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 09:16:36 2025 -0500

fix

commit 94bd6f3367bbd1ea55421c2ad70efe29e1f24b14
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 09:15:31 2025 -0500

fix

commit 672a950d20db2a06e0a1b0cfc462dceba77578b0
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 09:14:37 2025 -0500

refactoring

commit 459024419dc62fb6b295e55ce071d6c796e3c938
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 14:06:14 2025 +0000

bumped changelog version

commit aa63080f9600e45ca838436ffe32eed5d1c39dcb
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 09:01:01 2025 -0500

fix

commit 6af9d14c3739569d0258e44710f05b799fa7110b
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 08:59:04 2025 -0500

fix

commit b7ae5c1e9ef4820918ebd49c321e12a29a9bdeb2
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 08:48:36 2025 -0500

comment

commit 4e0068c8ab3a5b646ead8f8bacb9e398057163a7
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 08:48:11 2025 -0500

fix

commit 3d8d2bf522dba4cc061e013197f69e89264e4e0f
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 08:25:14 2025 -0500

fix

commit ca8d7bfab570a4ecc26505be4b0f4e9c375b4803
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 08:03:51 2025 -0500

fix

commit 993f0e5272240195da8ffb0d35f95e7b1e03fe2d
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:58:23 2025 -0500

output

commit 9160724f0952c5ec462406febe6667a9c280dc55
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:53:44 2025 -0500

fix

commit 4d7f6075ac4f170ac2da7dee405df9b9a1b0faa1
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:49:04 2025 -0500

fix

commit 501ecce93fa52ee6571d21cb046d345f5359d746
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:45:45 2025 -0500

fix

commit 1030a2ed4e3636d2e98abbc77f5c3dfe12f103b4
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:42:30 2025 -0500

output

commit 0c4549027f6199f05ad3abb75bede0de560fde1d
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:37:13 2025 -0500

fix

commit 7305312f37e3f8454130f36c44d0c9eeaa914521
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:29:30 2025 -0500

fix

commit 136e39c0968bad65b98041982696b85c054640e9
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:26:50 2025 -0500

output

commit 111f4f31f38dc5a69ab66a442268bfbc349d99fd
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:24:02 2025 -0500

output

commit 3772486f15e94cb47f32ed22f220448af5950201
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:23:18 2025 -0500

output

commit ae6349514266819cbd65d542aa854e39ba9210ee
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:20:44 2025 -0500

output

commit 3d3e98027550bbd9a6a3b4562ac5b9664cd2a1df
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:19:41 2025 -0500

output

commit 1a01ace1df908fc132c2409787bb9a65a6072f4c
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:17:40 2025 -0500

fix

commit 52fdd8884af57ea713c5a6071d28b3945a1dd5ab
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:13:52 2025 -0500

fix

commit 209572618e5e01438553559a6f11c06158a265ff
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:12:42 2025 -0500

refactoring

commit 6d297395e3a6c336f8a82621ec25f2d06fb38432
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 06:11:20 2025 -0500

refactoring

commit f8e5216419c1e943f4d098b739a159908aa0ebc2
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 04:29:43 2025 -0500

debugging

commit 5c2987cbb5e77b73f73703c1fa350a3e0e52d3f2
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 04:26:20 2025 -0500

debugging

commit 00662d62247268b017cf49a10d24eabfdba3da75
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 04:20:58 2025 -0500

output

commit 82f9b9644155a46cb0e7cc3339471b3fa5664b28
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue Dec 9 04:18:15 2025 -0500

fix

commit 470a0b02190efa1e9018041c56826113dff00db6
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Mon Dec 8 12:41:11 2025 +0000

bumped changelog version

commit a3f50d49851a4c2f2272310a82e7d4c0d1d45cc4
Author: Patrick Schleizer <adrelanos@whonix.org>
Date: Mon Dec 8 07:40:44 2025 -0500
Expand Down
18 changes: 18 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
helper-scripts (3:44.5-1) unstable; urgency=medium

* New upstream version (local package).

-- Patrick Schleizer <adrelanos@whonix.org> Tue, 09 Dec 2025 14:35:32 +0000

helper-scripts (3:44.4-1) unstable; urgency=medium

* New upstream version (local package).

-- Patrick Schleizer <adrelanos@whonix.org> Tue, 09 Dec 2025 14:27:15 +0000

helper-scripts (3:44.3-1) unstable; urgency=medium

* New upstream version (local package).

-- Patrick Schleizer <adrelanos@whonix.org> Tue, 09 Dec 2025 14:06:14 +0000

helper-scripts (3:44.2-1) unstable; urgency=medium

* New upstream version (local package).
Expand Down
28 changes: 18 additions & 10 deletions set-keymap-test-plan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@
* [ ] Run `set-labwc-keymap us,us ,colemak ,grp:alt_shift_toggle,`. Complains that empty keyboard layout option was found?
* [ ] Run `set-labwc-keymap us,us ,colemak grp:alt_shift_toggle,,caps:backspace`. Complains that empty keyboard layout option was found?
* [ ] set-labwc-keymap persistent tests
* [ ] Run `set-labwc-keymap --persist us`. Environment file is created with the following contents?
* [ ] Run `set-labwc-keymap us`. Environment file is created with the following contents?
* XKB_DEFAULT_LAYOUT=us
* XKB_DEFAULT_VARIANT=
* XKB_DEFAULT_OPTIONS=
* [ ] Run `set-labwc-keymap --persist de`. Environment file is created with the following contents?
* [ ] Run `set-labwc-keymap de`. Environment file is created with the following contents?
* XKB_DEFAULT_LAYOUT=de
* XKB_DEFAULT_VARIANT=
* XKB_DEFAULT_OPTIONS=
* [ ] Run `set-labwc-keymap --persist cz`. Environment file is created with the following contents?
* [ ] Run `set-labwc-keymap cz`. Environment file is created with the following contents?
* XKB_DEFAULT_LAYOUT=cz
* XKB_DEFAULT_VARIANT=
* XKB_DEFAULT_OPTIONS=
* [ ] Run `set-labwc-keymap --persist us,de,cz '' grp:alt_shift_toggle`. Environment file is created with the following contents?
* [ ] Run `set-labwc-keymap us,de,cz '' grp:alt_shift_toggle`. Environment file is created with the following contents?
* XKB_DEFAULT_LAYOUT=us,de,cz
* XKB_DEFAULT_VARIANT=
* XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle
* [ ] Run `set-labwc-keymap --persist us,us,us,de ,dvorak,colemak, grp:alt_shift_toggle,caps:backspace`. Environment file is created with the following contents?
* [ ] Run `set-labwc-keymap us,us,us,de ,dvorak,colemak, grp:alt_shift_toggle,caps:backspace`. Environment file is created with the following contents?
* XKB_DEFAULT_LAYOUT=us,us,us,de
* XKB_DEFAULT_VARIANT=,dvorak,colemak,
* XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:backspace
Expand All @@ -47,7 +47,7 @@
* XKB_DEFAULT_LAYOUT=us
* XKB_DEFAULT_VARIANT=,dvorak,colemak,
* XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:backspace
* [ ] Run `set-labwc-keymap --persist us,us,us,de ,dvorak,colemak, grp:alt_shift_toggle,caps:backspace`. Environment file is created with the following contents?
* [ ] Run `set-labwc-keymap us,us,us,de ,dvorak,colemak, grp:alt_shift_toggle,caps:backspace`. Environment file is created with the following contents?
* XKB_DEFAULT_LAYOUT=us,us,us,de
* XKB_DEFAULT_VARIANT=,dvorak,colemak,
* XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:backspace
Expand All @@ -58,7 +58,7 @@
* XKB_DEFAULT_VARIANT=,dvorak,colemak,
* XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:backspace
* E=F
* [ ] Run `set-labwc-keymap --persist es`. Environment file is created with the following contents?
* [ ] Run `set-labwc-keymap es`. Environment file is created with the following contents?
* A=B
* XKB_DEFAULT_LAYOUT=es
* C=D
Expand All @@ -72,7 +72,7 @@
* XKB_DEFAULT_VARIANT=
* XKB_DEFAULT_OPTIONS=
* E=F
* [ ] Run `set-labwc-keymap --persist us,us colemak,`. Environment file is created with the following contents?
* [ ] Run `set-labwc-keymap us,us colemak,`. Environment file is created with the following contents?
* A=B
* XKB_DEFAULT_LAYOUT=us,us
* C=D
Expand All @@ -89,7 +89,7 @@
* XKB_DEFAULT_OPTIONS=
* XKB_DEFAULT_OPTIONS=caps:backspace
* E=F
* [ ] Run `set-labwc-keymap --persist us,us,us,de ,dvorak,colemak, grp:alt_shift_toggle,caps:backspace`. Environment file is created with the following contents?
* [ ] Run `set-labwc-keymap us,us,us,de ,dvorak,colemak, grp:alt_shift_toggle,caps:backspace`. Environment file is created with the following contents?
* A=B
* #XKB_DEFAULT_LAYOUT=us
* XKB_DEFAULT_LAYOUT=us,us,us,de
Expand All @@ -100,7 +100,7 @@
* E=F
* [ ] set-labwc-keymap misc options
* [ ] Run `set-labwc-keymap --help`. Displays help?
* [ ] Run `set-labwc-keymap --config ./test --no-reload --persist us colemak`. Creates a file ~/.test with the following contents?
* [ ] Run `set-labwc-keymap --config ./test --no-reload us colemak`. Creates a file ~/.test with the following contents?
* XKB_DEFAULT_LAYOUT=us
* XKB_DEFAULT_VARIANT=colemak
* XKB_DEFAULT_OPTIONS=
Expand Down Expand Up @@ -251,3 +251,11 @@
* XKBVARIANT=",dvorak,colemak,"
* XKBOPTIONS="grp:alt_shift_toggle,caps:backspace"
* E=F
* [ ] keymap option validation across commands
* [ ] Run `set-console-keymap --no-persist us`. Fails with an error that `--no-persist` is only supported by `set-labwc-keymap`?
* [ ] Run `set-system-keymap --no-reload us`. Fails with an error that `--no-reload` is only supported by `set-labwc-keymap`?
* [ ] Run `set-console-keymap --config=./test us`. Fails with an error that `--config` is only supported by `set-labwc-keymap`?
* [ ] Run `set-labwc-keymap --no-update-grub us`. Fails with an error that `--no-update-grub` is only supported by `set-grub-keymap`?
* [ ] Run `set-grub-keymap --read-stdin us`. Fails with an error that `--read-stdin` must be used with `--build-all`?
* [ ] Run `set-grub-keymap --build-all us`. Fails with an error that `--build-all` does not accept positional arguments?
* [ ] Run `set-grub-keymap --build-all --interactive`. Fails with an error that `--interactive` cannot be used with `--build-all`?
54 changes: 49 additions & 5 deletions usr/bin/localectl-static
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,15 @@ set -o nounset
set -o errtrace
set -o pipefail

command -v stcat >/dev/null
command -v pager >/dev/null

use_pager='true'

while [ -n "${1:-}" ]; do
case "$1" in
'--no-pager')
use_pager='false'
shift
;;
'--')
Expand All @@ -22,13 +28,51 @@ while [ -n "${1:-}" ]; do
;;
esac
done

args=( "$@" )
subcommand="${args[0]:-}"

if [ -z "${subcommand}" ]; then
printf '%s\n' "$0: ERROR: Missing command (expected: list-x11-keymap-layouts|list-x11-keymap-variants|list-x11-keymap-options)"
exit 1
fi

helper_scripts_share_dir='/usr/share/helper-scripts'
layouts_static_file="${helper_scripts_share_dir}/localectl-list-x11-keymap-layouts-static.txt"
variants_static_dir="${helper_scripts_share_dir}/localectl-list-x11-keymap-variants-static.d"
options_static_file="${helper_scripts_share_dir}/localectl-list-x11-keymap-options-static.txt"

if [ "$args" = "list-x11-keymap-layouts" ]; then
stcat /usr/share/helper-scripts/localectl-list-x11-keymap-layouts-static.txt
elif [ "$args" = "list-x11-keymap-variants" ]; then
stcat /usr/share/helper-scripts/localectl-list-x11-keymap-variants-static.txt
if [ "${subcommand}" = "list-x11-keymap-layouts" ]; then
if [ "$use_pager" = 'true' ]; then
stcat "${layouts_static_file}" | pager
else
stcat "${layouts_static_file}"
fi
elif [ "${subcommand}" = "list-x11-keymap-variants" ]; then
if [ -z "${args[1]:-}" ]; then
printf '%s\n' "$0: ERROR: Missing layout argument!"
exit 1
fi
if ! [ -d "${variants_static_dir}" ]; then
printf '%s\n' "$0: ERROR: Folder variants_static_dir '${variants_static_dir}' missing! args[1]: '${args[1]}'!"
exit 1
fi
if ! [ -f "${variants_static_dir}/${args[1]}" ]; then
printf '%s\n' "$0: ERROR: Unrecognized keymap '${args[1]}'!"
exit 1
fi
if [ "$use_pager" = 'true' ]; then
stcat "${variants_static_dir}/${args[1]}" | pager
else
stcat "${variants_static_dir}/${args[1]}"
fi
elif [ "${subcommand}" = "list-x11-keymap-options" ]; then
if [ "$use_pager" = 'true' ]; then
stcat "${options_static_file}" | pager
else
stcat "${options_static_file}"
fi
else
printf '%s\n' "$0: ERROR: Unknown command: '$@'"
printf '%s\n' "$0: ERROR: Unknown command: '${args[*]}'"
exit 1
fi
Loading