X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fkeymap%2Fcheck-keymaps.sh;h=f79c3f5a823e11214a5702cb12519085b871ae86;hp=dc46f595311c4513fe6aa04e17f5726891ef5458;hb=7d701b0e26f96c279ef9ba8e4ef82fc4fca56acf;hpb=2417dc20f5147556d0ed4f95a37b1547fb4b0f2b

diff --git a/extras/keymap/check-keymaps.sh b/extras/keymap/check-keymaps.sh
index dc46f5953..f79c3f5a8 100755
--- a/extras/keymap/check-keymaps.sh
+++ b/extras/keymap/check-keymaps.sh
@@ -1,29 +1,32 @@
 #!/bin/bash
 
 # check that all key names in keymaps/* are known in <linux/input.h>
-KEYLIST=./keys.txt
-RULES=95-keymap.rules
+KEYLIST=extras/keymap/keys.txt
+RULES=extras/keymap/95-keymap.rules
 
 [ -e "$KEYLIST" ] || {
     echo "need $KEYLIST please build first" >&2
     exit 1
 }
 
-missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) <(awk '{print $2}' keymaps/*|sort -u))
+missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) <(awk '{print $2}' extras/keymap/keymaps/*|sort -u))
 [ -z "$missing" ] || {
-    echo "ERROR: unknown key names in keymaps/*:" >&2
+    echo "ERROR: unknown key names in extras/keymap/keymaps/*:" >&2
     echo "$missing" >&2
     exit 1
 }
 
 # check that all maps referred to in $RULES exist
-maps=$(sed -rn '/keymap \$name/ { s/^.*\$name ([^"]+).*$/\1/; p }' $RULES)
+maps=$(sed -rn '/keymap \$name/ { s/^.*\$name ([^"[:space:]]+).*$/\1/; p }' $RULES)
 for m in $maps; do
-    [ -e keymaps/$m ] || {
+    # ignore inline mappings
+    [ "$m" = "${m#0x}" ] || continue
+
+    [ -e extras/keymap/keymaps/$m ] || {
 	echo "ERROR: unknown map name in $RULES: $m" >&2
 	exit 1
     }
-    grep -q "keymaps/$m\>" Makefile.am || {
+    grep -q "extras/keymap/keymaps/$m\>" Makefile.am || {
 	echo "ERROR: map file $m is not added to Makefile.am" >&2
 	exit 1
     }