Try to work with more devices.

8 files changed, 40 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c98d69140e68..860d6125fc09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,26 @@
 pkgbase = un-apple-keyboard
-	pkgdesc = Make Apple aluminium keyboards like all your other keyboards
-	pkgver = 0.1
+	pkgdesc = Make Apple keyboards like all your other keyboards
+	pkgver = 0.2
 	pkgrel = 1
 	url = http://tavianator.com
 	arch = any
 	license = custom:WTFPL
 	depends = keyfuzz
-	source = 10-apple-aluminium.rules
+	source = 10-apple-keyboard.rules
 	source = fix-apple-keyboard
-	source = apple_aluminium.keyfuzz
+	source = apple_keyboard.keyfuzz
 	source = hid_apple.conf
 	source = LICENSE
-	md5sums = 6b0fcc198b384bd3bb7147fd2b4c60bd
-	md5sums = 2f42654055cb7bcba6c217df96e84fee
-	md5sums = f0c831773a34dbbe0f4a60f36ebdea53
-	md5sums = 02a1d43b71095533cb1e7d222d1dcc84
+	md5sums = 6a3b7cc9f479ebeb9cbe1c4be2bacdc7
+	md5sums = 23db0a70399ede5df5510b1e86c89ca4
+	md5sums = 4cba96fa875bea22b7c69bc7e7531a6c
+	md5sums = 35019f48e80ec0bf9a23894583248926
 	md5sums = f312a7c4d02230e8f2b537295d375c69
+	sha256sums = 3ad9b8aead82065127fde1fa956c7a511027567073ac0834c16dad27a4d3ccde
+	sha256sums = fdf61a06d4c524d8f4e1c144442fece3c1a7a03b4b4da01c1af22d9b97f58c9a
+	sha256sums = fb0fdb5160c55b52a1f6d5e80c2045919afc4e5306e592abe86cbb3b8af2c643
+	sha256sums = 223edb42311684dc7585b4af25d7fc27ba629a66060b520283d0ebf95a39dc78
+	sha256sums = 96f17857f3eb28a7d93dad930bc099a3cb65a9a2afb37069bfd1ba5ec5964389
 
 pkgname = un-apple-keyboard
 
diff --git a/10-apple-aluminium.rules b/10-apple-aluminium.rules
deleted file mode 100644
index 1f4036651795..000000000000
--- a/10-apple-aluminium.rules
+++ /dev/null
@@ -1,4 +0,0 @@
-# Reconfigure the keyboard layout of Apple slim aluminium keyboards to match the
-# rest of the world's keyboards
-
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="024f", ACTION=="add", RUN+="/usr/bin/fix-apple-keyboard"
diff --git a/10-apple-keyboard.rules b/10-apple-keyboard.rules
new file mode 100644
index 000000000000..eb660bb7e853
--- /dev/null
+++ b/10-apple-keyboard.rules
@@ -0,0 +1,4 @@
+# Reconfigure the keyboard layout of Apple keyboards to match the rest of the
+# world's keyboards
+
+SUBSYSTEMS=="input", ATTRS{name}=="Apple Inc. Apple Keyboard", ACTION=="add", RUN+="/usr/bin/fix-apple-keyboard '%E{DEVNAME}'"
diff --git a/PKGBUILD b/PKGBUILD
index 224d3217fe52..c4203a248467 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Tavian Barnes <tavianator@tavianator.com>
 pkgname=un-apple-keyboard
-pkgver=0.1
+pkgver=0.2
 pkgrel=1
 epoch=
-pkgdesc="Make Apple aluminium keyboards like all your other keyboards"
+pkgdesc="Make Apple keyboards like all your other keyboards"
 arch=('any')
 url="http://tavianator.com"
 license=('custom:WTFPL')
@@ -19,21 +19,26 @@ backup=()
 options=()
 install=
 changelog=
-source=('10-apple-aluminium.rules'
+source=('10-apple-keyboard.rules'
         'fix-apple-keyboard'
-        'apple_aluminium.keyfuzz'
+        'apple_keyboard.keyfuzz'
         'hid_apple.conf'
         'LICENSE')
-md5sums=('6b0fcc198b384bd3bb7147fd2b4c60bd'
-         '2f42654055cb7bcba6c217df96e84fee'
-         'f0c831773a34dbbe0f4a60f36ebdea53'
-         '02a1d43b71095533cb1e7d222d1dcc84'
+md5sums=('6a3b7cc9f479ebeb9cbe1c4be2bacdc7'
+         '23db0a70399ede5df5510b1e86c89ca4'
+         '4cba96fa875bea22b7c69bc7e7531a6c'
+         '35019f48e80ec0bf9a23894583248926'
          'f312a7c4d02230e8f2b537295d375c69')
+sha256sums=('3ad9b8aead82065127fde1fa956c7a511027567073ac0834c16dad27a4d3ccde'
+            'fdf61a06d4c524d8f4e1c144442fece3c1a7a03b4b4da01c1af22d9b97f58c9a'
+            'fb0fdb5160c55b52a1f6d5e80c2045919afc4e5306e592abe86cbb3b8af2c643'
+            '223edb42311684dc7585b4af25d7fc27ba629a66060b520283d0ebf95a39dc78'
+            '96f17857f3eb28a7d93dad930bc099a3cb65a9a2afb37069bfd1ba5ec5964389')
 
 package() {
-    install -D -m644 "${srcdir}/10-apple-aluminium.rules" "${pkgdir}/etc/udev/rules.d/10-apple-aluminium.rules"
+    install -D -m644 "${srcdir}/10-apple-keyboard.rules" "${pkgdir}/etc/udev/rules.d/10-apple-keyboard.rules"
     install -D -m755 "${srcdir}/fix-apple-keyboard" "${pkgdir}/usr/bin/fix-apple-keyboard"
-    install -D -m644 "${srcdir}/apple_aluminium.keyfuzz" "${pkgdir}/etc/keyfuzz/apple_aluminium.keyfuzz"
+    install -D -m644 "${srcdir}/apple_keyboard.keyfuzz" "${pkgdir}/etc/keyfuzz/apple_keyboard.keyfuzz"
     install -D -m644 "${srcdir}/hid_apple.conf" "${pkgdir}/etc/modprobe.d/hid_apple.conf"
     install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}"
 }
diff --git a/apple_aluminium.keyfuzz b/apple_aluminium.keyfuzz
deleted file mode 100644
index 90b2c808ea36..000000000000
--- a/apple_aluminium.keyfuzz
+++ /dev/null
@@ -1,15 +0,0 @@
-# Map Alt to Meta
-458978 125
-# Map Meta to Alt
-458979 56
-# Map Right Meta to Right Alt
-458983 100
-# Map Right Alt to Right Meta
-458982 126
-
-# Map F13 to SYSRQ
-458856 99
-# Map F14 to Scroll Lock
-458857 70
-# Map F15 to Pause
-458858 119
diff --git a/apple_keyboard.keyfuzz b/apple_keyboard.keyfuzz
new file mode 100644
index 000000000000..47b1c3cc2607
--- /dev/null
+++ b/apple_keyboard.keyfuzz
@@ -0,0 +1,6 @@
+# Map F13 to SYSRQ
+458856 99
+# Map F14 to Scroll Lock
+458857 70
+# Map F15 to Pause
+458858 119
diff --git a/fix-apple-keyboard b/fix-apple-keyboard
index ee4a58a44e6b..9608ba57c830 100755
--- a/fix-apple-keyboard
+++ b/fix-apple-keyboard
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-keyfuzz -s -d /dev/input/by-id/usb-Apple_Inc._Apple_Keyboard-event-kbd < /etc/keyfuzz/apple_aluminium.keyfuzz
+keyfuzz -s -d "$1" < /etc/keyfuzz/apple_keyboard.keyfuzz
diff --git a/hid_apple.conf b/hid_apple.conf
index 44c76e7b4b1a..3fe75a738cc3 100644
--- a/hid_apple.conf
+++ b/hid_apple.conf
@@ -1 +1 @@
-options hid_apple fnmode=2
+options hid_apple fnmode=2 swap_opt_cmd=1