remove keylayout_list.sh, always generates all layouts

wallix · Dec 16, 2024 · 40ac32c · 40ac32c
1 parent 9759f8f
commit 40ac32c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 109 deletions.
diff --git a/README.md b/README.md
@@ -23,14 +23,8 @@ npm i
 ./tools/gen_reversed_keylayout.sh
 ```
 
-or
-
-```sh
-./tools/gen_reversed_keylayout.sh --all
-```
-
 Readable version with
 
 ```sh
-DEBUG=1 ./tools/gen_reversed_keylayout.sh --all
+DEBUG=1 ./tools/gen_reversed_keylayout.sh
 ```
diff --git a/tools/gen_reversed_keylayout.sh b/tools/gen_reversed_keylayout.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# uncompress: tar --zstd -xf kbdlayout.info.zst
+# uncompress: tar --zstd -xf kbdlayout.info.tar.zst
 
 set -e
 
@@ -15,16 +15,12 @@ if [[ -z "$KBDLAYOUT_PATH" ]]; then
 fi
 
 case "$1" in
-  --all|all)
-    genfile "${KBDLAYOUT_PATH}"/* ;;
-
-  --regular|'')
-    source "$d"/keylayout_list.sh
-    genfile "${KBDLAYOUT_LAYOUTS[@]}" ;;
+  --all|all|'')
+    genfile "${KBDLAYOUT_PATH}"/*.xml ;;
 
   --help|help)
     echo "usage:
-$0 [--all|all|--regular|regular]
+$0 [--all|all]
 $0 files..." ;;
 
   *) genfile "$@"

diff --git a/tools/kbd_parser.py b/tools/kbd_parser.py
@@ -18,7 +18,7 @@ class DeadKey(NamedTuple):
     with_: str
     text: str
     codepoint: int
-    deadkeys: DeadKeysType
+    deadkeys: DeadKeysType | None
 
 
 class Key(NamedTuple):

diff --git a/tools/kbdlayout.info.tar.zst b/tools/kbdlayout.info.tar.zst
diff --git a/tools/kbdlayout.info.zst b/tools/kbdlayout.info.zst
diff --git a/tools/keylayout_list.sh b/tools/keylayout_list.sh