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=df18c3f488f19c8c6b5f5a63bea06ac08a6a3289;hp=15e8ef8c1ebe03c62e1dd981f4d9c62a5043616b;hb=3aa3be179fd7eea792e5dfe71e0b2c9723c8a9b2;hpb=04ff303730b3c6c38fd9d7df08f9e403ccd9de3c

diff --git a/extras/keymap/check-keymaps.sh b/extras/keymap/check-keymaps.sh
index 15e8ef8c1..df18c3f48 100755
--- a/extras/keymap/check-keymaps.sh
+++ b/extras/keymap/check-keymaps.sh
@@ -1,17 +1,22 @@
 #!/bin/bash
 
 # check that all key names in keymaps/* are known in <linux/input.h>
-KEYLIST=./keys.txt
-RULES=95-keymap.rules
+# and that all key maps listed in the rules are valid and present in
+# Makefile.am
+SRCDIR=${1:-.}
+KEYLIST=${2:-extras/keymap/keys.txt}
+KEYMAPS_DIR=$SRCDIR/extras/keymap/keymaps #extras/keymap/keymaps
+RULES=$SRCDIR/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) \
+                    <(grep -hv '^#' ${KEYMAPS_DIR}/*| awk '{print $2}' | 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
 }
@@ -22,11 +27,11 @@ for m in $maps; do
     # ignore inline mappings
     [ "$m" = "${m#0x}" ] || continue
 
-    [ -e keymaps/$m ] || {
+    [ -e ${KEYMAPS_DIR}/$m ] || {
 	echo "ERROR: unknown map name in $RULES: $m" >&2
 	exit 1
     }
-    grep -q "keymaps/$m\>" Makefile.am || {
+    grep -q "extras/keymap/keymaps/$m\>" $SRCDIR/Makefile.am || {
 	echo "ERROR: map file $m is not added to Makefile.am" >&2
 	exit 1
     }