diff options
-rw-r--r-- | hooks/keymap | 12 | ||||
-rw-r--r-- | install/keymap | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/hooks/keymap b/hooks/keymap index d00df9b..414338b 100644 --- a/hooks/keymap +++ b/hooks/keymap @@ -4,18 +4,18 @@ run_hook () msg -n ":: Loading keymap..." . /keymap if [ "$KEYMAP" != "" ]; then - /bin/loadkeys -q $KEYMAP + /bin/loadkeys -q $KEYMAP fi # If locale is *.utf set console to Unicode mode if [ "$UTF8" = "yes" ]; then - /bin/kbd_mode -u - /bin/dumpkeys | /bin/loadkeys --unicode - echo -ne "\e%G" >> /dev/console + /bin/kbd_mode -u + /bin/dumpkeys | /bin/loadkeys --unicode + echo -ne "\e%G" >> /dev/console fi if [ "$CONSOLEMAP" != "" ]; then - /bin/setfont -m $CONSOLEMAP $CONSOLEFONT -C /dev/console + /bin/setfont -m $CONSOLEMAP $CONSOLEFONT -C /dev/console else - /bin/setfont $CONSOLEFONT -C /dev/console + /bin/setfont $CONSOLEFONT -C /dev/console fi msg "done." } diff --git a/install/keymap b/install/keymap index 03c5a98..650e071 100644 --- a/install/keymap +++ b/install/keymap @@ -22,8 +22,9 @@ install () [ "$CONSOLEFONT" != "" ] && add_file /usr/share/kbd/consolefonts/$(grep "CONSOLEFONT=" /etc/rc.conf | awk -FCONSOLEFONT= '{print $2}')* [ "$CONSOLEMAP" != "" ] && add_file /usr/share/kbd/unimaps/$(grep "CONSOLEMAP=" /etc/rc.conf | awk -FCONSOLEMAP= '{print $2}')* if [ "$KEYMAP" != "" ]; then - for i in $(find /usr/share/kbd/ -name "$(grep "KEYMAP=" /etc/rc.conf | awk -FKEYMAP= '{print $2}' | awk -F- '{print $1}')*.map.gz") - do add_file $i + for i in $(find /usr/share/kbd/ -name "$(grep "KEYMAP=" /etc/rc.conf |\ + awk -FKEYMAP= '{print $2}' | awk -F- '{print $1}')*.map.gz"); do + add_file $i done for i in $(echo /usr/share/kbd/keymaps/include/*); do add_file $i |