[arch-projects] [mkinitcpio][PATCH 1/2] keymap: fall back to us if KEYMAP is not defined

2 Jul 2016

ref: https://bugs.archlinux.org/task/44805
---
 install/keymap | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/install/keymap b/install/keymap
index c1948b1..7de6acb 100644
--- a/install/keymap
+++ b/install/keymap
@@ -14,16 +14,11 @@ build() {
         [[ $LANG ]] && LOCALE=$LANG
         LANG=$l
 
-        if [[ $KEYMAP ]]; then
-            if [[ $LOCALE = *[Uu][Tt][Ff]?(-)8 ]]; then
-                touch "$BUILDROOT/keymap.utf8"
-                uc=-u
-            fi
-            loadkeys -q $uc $KEYMAP -b > "$BUILDROOT/keymap.bin"
-        else
-            warning "keymap: hook specified, but no KEYMAP found in configuration"
-            return 1
+        if [[ $LOCALE = *[Uu][Tt][Ff]?(-)8 ]]; then
+            touch "$BUILDROOT/keymap.utf8"
+            uc=-u
         fi
+        loadkeys -q $uc ${KEYMAP:-us} -b > "$BUILDROOT/keymap.bin"
     ) && add_runscript
 }
 
-- 
2.8.3

    

Dave Reisner