chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
collect, keymap, systemctl: use _noreturn_
[elogind.git]
/
src
/
udev
/
keymap
/
check-keymaps.sh
diff --git
a/src/udev/keymap/check-keymaps.sh
b/src/udev/keymap/check-keymaps.sh
index 405168c6675d5fdae7ad775268be1fa7bdbc8afe..c4572745e031b532f21be3444c4d4696387475c1 100755
(executable)
--- a/
src/udev/keymap/check-keymaps.sh
+++ b/
src/udev/keymap/check-keymaps.sh
@@
-4,9
+4,9
@@
# and that all key maps listed in the rules are valid and present in
# Makefile.am
SRCDIR=${1:-.}
# and that all key maps listed in the rules are valid and present in
# Makefile.am
SRCDIR=${1:-.}
-KEYLIST=${2:-src/keymap/keys.txt}
-KEYMAPS_DIR=$SRCDIR/
src/keymap/
keymaps
-RULES=$SRCDIR/src/keymap/95-keymap.rules
+KEYLIST=${2:-src/
udev/
keymap/keys.txt}
+KEYMAPS_DIR=$SRCDIR/keymaps
+RULES=$SRCDIR/src/
udev/
keymap/95-keymap.rules
[ -e "$KEYLIST" ] || {
echo "need $KEYLIST please build first" >&2
[ -e "$KEYLIST" ] || {
echo "need $KEYLIST please build first" >&2
@@
-16,7
+16,7
@@
RULES=$SRCDIR/src/keymap/95-keymap.rules
missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) \
<(grep -hv '^#' ${KEYMAPS_DIR}/*| awk '{print $2}' | sort -u))
[ -z "$missing" ] || {
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
src/keymap/
keymaps/*:" >&2
+ echo "ERROR: unknown key names in keymaps/*:" >&2
echo "$missing" >&2
exit 1
}
echo "$missing" >&2
exit 1
}
@@
-31,7
+31,7
@@
for m in $maps; do
echo "ERROR: unknown map name in $RULES: $m" >&2
exit 1
}
echo "ERROR: unknown map name in $RULES: $m" >&2
exit 1
}
- grep -q "
src/keymap/
keymaps/$m\>" $SRCDIR/Makefile.am || {
+ grep -q "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
}