Use same script to build key list in Makefile and meson

3 files changed, 11 insertions, 18 deletions

diff --git a/src/udev/generate-keyboard-gperf.py b/src/udev/generate-keyboard-gperf.py
deleted file mode 100755
index 03d3bba7d3..0000000000
--- a/src/udev/generate-keyboard-gperf.py
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env python3
-
-"""Generate keyboard-keys-from-name.gperf from keyboard-keys-list.txt
-"""
-
-import sys
-
-input = sys.argv[1]
-
-print("""\
-struct key_name { const char* name; unsigned short id; };
-%null-strings
-%%""")
-
-for line in open(input):
-    print("{0}, {1}".format(line.rstrip()[4:].lower(), line.rstrip()))
diff --git a/src/udev/generate-keyboard-keys-gperf.sh b/src/udev/generate-keyboard-keys-gperf.sh
new file mode 100755
index 0000000000..36ce0bd6cc
--- /dev/null
+++ b/src/udev/generate-keyboard-keys-gperf.sh
@@ -0,0 +1,9 @@
+#!/bin/sh -eu
+awk '   BEGIN {
+                print "struct key_name { const char* name; unsigned short id; };"
+                print "%null-strings"
+                print "%%"
+        }
+
+        /^KEY_/ { print tolower(substr($1 ,5)) ", " $1 }
+' < "$1"
diff --git a/src/udev/meson.build b/src/udev/meson.build
index 9c81bce545..eeb341f8d1 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -59,13 +59,13 @@ keyboard_keys_list_txt = custom_target(
         command : [generate_keyboard_keys_list, cpp],
         capture : true)
 
-generate_keyboard_gperf = find_program('generate-keyboard-gperf.py')
+generate_keyboard_keys_gperf = find_program('generate-keyboard-keys-gperf.sh')
 fname = 'keyboard-keys-from-name.gperf'
 gperf_file = custom_target(
         fname,
         input : keyboard_keys_list_txt,
         output : fname,
-        command : [generate_keyboard_gperf, '@INPUT@'],
+        command : [generate_keyboard_keys_gperf, '@INPUT@'],
         capture : true)
 
 fname = 'keyboard-keys-from-name.h'