X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_bin%2Fgrml-lang;h=0b330605f50c9fc65d118dd8b8f0bb97fe70f295;hb=5b0c6b200fe0a76b7a78c984733defdb3120ea6a;hp=19b0b6952e4d9a31e4a0609925d98c401feee827;hpb=9fef74081f53d30174118872324fa62d4a8145b5;p=grml-scripts.git

diff --git a/usr_bin/grml-lang b/usr_bin/grml-lang
index 19b0b69..0b33060 100755
--- a/usr_bin/grml-lang
+++ b/usr_bin/grml-lang
@@ -6,16 +6,46 @@
 # License:       This file is licensed under the GPL v2.
 ################################################################################
 
+CONFFILE=/etc/sysconfig/keyboard
+PN="$(basename $0)"
+
 usage(){
     echo "Usage: $0 <language>"
-    echo "supported values: at, ch, de, dvorak, es, jp, us"
+    echo "supported values: at, ch, de, dvorak, es, fr, jp, us"
+}
+
+setvalue(){
+  [ -n "$2" ] || return 1
+  # already present in conffile?
+  if grep -q ${1} $CONFFILE 2>/dev/null ; then
+     sudo sed -i "s#^${1}.*#${1}=${2}#"   $CONFFILE
+  else
+     echo "$1=${2}" | sudo tee -a $CONFFILE >/dev/null
+  fi
 }
 
 if [ $# -lt "1" ] ; then
    usage
-   exit -1
+   exit 1
 fi
 
+[ -d /etc/sysconfig ] || sudo mkdir /etc/sysconfig
+
+
+LANGUAGE="$1"
+
+
+. /etc/grml/language-functions
+
+if [ ! -z "$KEYTABLE" ] ; then
+    setvalue KEYTABLE "$KEYTABLE"
+fi
+
+if [ ! -z "XKEYBOARD" ] ; then
+    setvalue XKEYBOARD $XKEYBOARD
+fi
+
+
 if [ -z "$DISPLAY" ] ;then
   if [ "$1" = "de" ] ; then
     echo "Loading keymap for Germany..."
@@ -45,6 +75,10 @@ if [ -z "$DISPLAY" ] ;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
@@ -84,6 +118,10 @@ else
       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."
       echo