From 1793ad71472d85912dd258cc6730e20a46dbbb17 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Tue, 12 Jul 2011 20:53:42 -0400
Subject: keymap: simplify unicode detection

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
---
 hooks/keymap | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'hooks')

diff --git a/hooks/keymap b/hooks/keymap
index 3593168..afdb628 100644
--- a/hooks/keymap
+++ b/hooks/keymap
@@ -3,14 +3,15 @@ run_hook ()
 {
     if [ -e /keymap.bin ]; then
         msg -n ":: Loading keymap..."
-        . /keymap.utf8
-        if [ "${UTF8}" = "yes" ]; then
-            kbd_mode -u -C /dev/console
-            printf "\033%%G" >> /dev/console
+        if [ -f /keymap.utf8 ]; then
+          mode=-u
+          ctrl=G
         else
-            kbd_mode -a -C /dev/console
-            printf "\033%%@" >> /dev/console
+          mode=-a
+          ctrl=@
         fi
+        kbd_mode $mode -C /dev/console
+        printf "\033%%$ctrl" >> /dev/console
         loadkmap < /keymap.bin
         msg "done."
     fi
-- 
cgit v1.2.3-24-g4f1b