X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=usr_bin%2Fgrml-lang;h=52b81a05f779475e7f39b88ba26e54eb2df83131;hb=HEAD;hp=6221705d35b348fefea1ce81ce489c675505bd89;hpb=43479260b590c38cd4a3a3f4d6e53ff5b858ffef;p=grml-scripts.git

diff --git a/usr_bin/grml-lang b/usr_bin/grml-lang
index 6221705..52b81a0 100755
--- a/usr_bin/grml-lang
+++ b/usr_bin/grml-lang
@@ -1,20 +1,36 @@
-#!/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]
 ################################################################################
 
+CONFFILE=/etc/default/keyboard
+PN="$(basename "$0")"
+
 usage(){
-    echo "Usage: $0 <language>"
-    echo "supported values: at, de, ch, jp, us"
+    echo "Usage: ${PN} <language>"
+    echo "supported values: at, ch, de, dvorak, es, fr, it, jp, us"
+}
+
+setvalue(){
+  [ -n "$2" ] || return 1
+  sudo sed -i "s#^${1}=.*#${1}=\"${2}\"#" "${CONFFILE}"
 }
 
 if [ $# -lt "1" ] ; then
-   usage
-   exit -1
+   usage >&2
+   exit 1
+fi
+
+LANGUAGE="$1"
+
+# shellcheck disable=SC1091
+. /etc/grml/language-functions
+
+if [ -n "$XKEYBOARD" ] ; then
+  setvalue XKBLAYOUT "$XKEYBOARD"
 fi
 
 if [ -z "$DISPLAY" ] ;then
@@ -30,14 +46,30 @@ if [ -z "$DISPLAY" ] ;then
     echo "Loading keymap for Switzerland..."
     sudo loadkeys i386/qwertz/sg-latin1.kmap.gz
     echo -e "\nDone."
+  elif [ "$1" = "it" ] ; then
+    echo "Loading keymap for Italy..."
+    sudo loadkeys i386/qwerty/it.kmap.gz
+    echo -e "\nDone."
   elif [ "$1" = "us" ] ; 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."
+  elif [ "$1" = "fr" ] ; then
+    echo 'Loading keymap fr...'
+    sudo loadkeys i386/azerty/fr.kmap.gz
+    echo -e "\nDone."
   else echo "No valid parameter given.
 
 Notice: Use loadkeys on console and setxkbmap when running X for
@@ -51,7 +83,11 @@ else
   else
     if [ "$1" = "de" ] ; then
       echo "Loading keymap for Germany..."
-      [ -r $HOME/.Xmodmap.german ] && xmodmap $HOME/.Xmodmap.german || setxkbmap de
+      if [ -r "${HOME}"/.Xmodmap.german ] ; then
+        xmodmap "${HOME}"/.Xmodmap.german || setxkbmap de
+      else
+        setxkbmap de
+      fi
       echo -e "\nDone."
     elif [ "$1" = "at" ] ; then
       echo "Loading keymap for Austria..."
@@ -61,13 +97,33 @@ else
       echo "Loading keymap for Switzerland..."
       setxkbmap ch
       echo -e "\nDone."
+    elif [ "$1" = "it" ] ; then
+      echo "Loading keymap for Italy..."
+      setxkbmap it
+      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
+      if [ -r "${HOME}"/.Xmodmap ] ; then
+        xmodmap "${HOME}"/.Xmodmap || setxkbmap us
+      else
+        setxkbmap us
+      fi
+      echo -e "\nDone."
+    elif [ "$1" = "es" ] ; then
+      echo "Loading keymap es..."
+      setxkbmap es
+      echo -e "\nDone."
+    elif [ "$1" = "fr" ] ; then
+      echo "Loading keymap fr..."
+      setxkbmap fr
       echo -e "\nDone."
     else
       echo "No valid parameter given."