X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_bin%2Fgrml-lang;h=19b0b6952e4d9a31e4a0609925d98c401feee827;hb=refs%2Ftags%2Fv1.1.25;hp=6221705d35b348fefea1ce81ce489c675505bd89;hpb=43479260b590c38cd4a3a3f4d6e53ff5b858ffef;p=grml-scripts.git

diff --git a/usr_bin/grml-lang b/usr_bin/grml-lang
index 6221705..19b0b69 100755
--- a/usr_bin/grml-lang
+++ b/usr_bin/grml-lang
@@ -1,15 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      grml-lang
 # Purpose:       load specific keyboard layout settings
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mon Mai 28 13:30:05 CEST 2007 [mika]
 ################################################################################
 
 usage(){
     echo "Usage: $0 <language>"
-    echo "supported values: at, de, ch, jp, us"
+    echo "supported values: at, ch, de, dvorak, es, jp, us"
 }
 
 if [ $# -lt "1" ] ; then
@@ -34,10 +33,18 @@ if [ -z "$DISPLAY" ] ;then
     echo 'Loading keymap us...'
     sudo loadkeys i386/qwerty/us-latin1.kmap.gz
     echo -e "\nDone."
+  elif [ "$1" = "dvorak" ] ; then
+    echo 'Loading keymap dvorak...'
+    sudo loadkeys dvorak
+    echo -e "\nDone."
   elif [ "$1" = "jp" ] ; then
     echo 'Loading keymap jp...'
     sudo loadkeys i386/qwerty/jp106.kmap.gz
     echo -e "\nDone."
+  elif [ "$1" = "es" ] ; then
+    echo 'Loading keymap es...'
+    sudo loadkeys i386/qwerty/es.kmap.gz
+    echo -e "\nDone."
   else echo "No valid parameter given.
 
 Notice: Use loadkeys on console and setxkbmap when running X for
@@ -63,12 +70,20 @@ else
       echo -e "\nDone."
     elif [ "$1" = "jp" ] ; then
       echo "Loading keymap for Japan..."
-      setxkbmap jp
+      setxkbmap -model jp106 -layout jp
+      echo -e "\nDone."
+    elif [ "$1" = "dvorak" ] ; then
+      echo "Loading keymap dvorak..."
+      setxkbmap dvorak
       echo -e "\nDone."
     elif [ "$1"  = "us" ] ; then
       echo 'Loading keymap us...'
       [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap || setxkbmap us
       echo -e "\nDone."
+    elif [ "$1" = "es" ] ; then
+      echo "Loading keymap es..."
+      setxkbmap es
+      echo -e "\nDone."
     else
       echo "No valid parameter given."
       echo