extras/keymap/check-keymaps.sh: Ignore comment-only lines

[elogind.git] / extras / keymap / check-keymaps.sh

diff --git a/extras/keymap/check-keymaps.sh b/extras/keymap/check-keymaps.sh
index d4e3e917605b9b50355c755ac9d36ea760d290a6..c92246a2cd3fdd35d2ea515d16897059f4058579 100755 (executable)
--- a/extras/keymap/check-keymaps.sh
+++ b/extras/keymap/check-keymaps.sh
@@ -4,7 +4,7 @@
 # and that all key maps listed in the rules are valid and present in
 # Makefile.am
 SRCDIR=$1
-KEYLIST=$SRCDIR/extras/keymap/keys.txt
+KEYLIST=$2
 KEYMAPS_DIR=$SRCDIR/extras/keymap/keymaps #extras/keymap/keymaps
 RULES=$SRCDIR/extras/keymap/95-keymap.rules
 
@@ -13,7 +13,8 @@ RULES=$SRCDIR/extras/keymap/95-keymap.rules
     exit 1
 }
 
-missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) <(awk '{print $2}' ${KEYMAPS_DIR}/*|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 extras/keymap/keymaps/*:" >&2
     echo "$missing" >&2