chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rules: mount fuse filesystem only 'add'
[elogind.git]
/
extras
/
keymap
/
check-keymaps.sh
diff --git
a/extras/keymap/check-keymaps.sh
b/extras/keymap/check-keymaps.sh
index 15e8ef8c1ebe03c62e1dd981f4d9c62a5043616b..c92246a2cd3fdd35d2ea515d16897059f4058579 100755
(executable)
--- 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>
#!/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
+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
}
[ -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" ] || {
[ -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
}
echo "$missing" >&2
exit 1
}
@@
-22,11
+27,11
@@
for m in $maps; do
# ignore inline mappings
[ "$m" = "${m#0x}" ] || continue
# 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
}
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
}
echo "ERROR: map file $m is not added to Makefile.am" >&2
exit 1
}