From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Sat, 18 Jul 2009 13:07:55 +0000 (+0200)
Subject: extras/keymap: fix check-keymaps.sh for inline mappings
X-Git-Tag: 174~889
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=04ff303730b3c6c38fd9d7df08f9e403ccd9de3c

extras/keymap: fix check-keymaps.sh for inline mappings

Do not complain about missing keymap files when giving scancode/keyname pairs
on the keymap command line in the rules.
---

diff --git a/extras/keymap/check-keymaps.sh b/extras/keymap/check-keymaps.sh
index dc46f5953..15e8ef8c1 100755
--- a/extras/keymap/check-keymaps.sh
+++ b/extras/keymap/check-keymaps.sh
@@ -17,8 +17,11 @@ missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) <(
 }
 
 # 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
+    # ignore inline mappings
+    [ "$m" = "${m#0x}" ] || continue
+
     [ -e keymaps/$m ] || {
 	echo "ERROR: unknown map name in $RULES: $m" >&2
 	exit 1