X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_bin%2Fgrml-lang;h=52b81a05f779475e7f39b88ba26e54eb2df83131;hb=02a237b8633dca400bd1d08f87c24cea30933f92;hp=3376d4cf813961b4169cb0e98109fe761a0379dd;hpb=a516f0e5306fd6f70336b0a0a13a022ed9c8314f;p=grml-scripts.git

diff --git a/usr_bin/grml-lang b/usr_bin/grml-lang
index 3376d4c..52b81a0 100755
--- a/usr_bin/grml-lang
+++ b/usr_bin/grml-lang
@@ -6,46 +6,33 @@
 # License:       This file is licensed under the GPL v2.
 ################################################################################
 
-CONFFILE=/etc/sysconfig/keyboard
-PN="$(basename $0)"
+CONFFILE=/etc/default/keyboard
+PN="$(basename "$0")"
 
 usage(){
-    echo "Usage: $0 <language>"
-    echo "supported values: at, ch, de, dvorak, es, jp, us"
+    echo "Usage: ${PN} <language>"
+    echo "supported values: at, ch, de, dvorak, es, fr, it, 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
+  sudo sed -i "s#^${1}=.*#${1}=\"${2}\"#" "${CONFFILE}"
 }
 
 if [ $# -lt "1" ] ; then
-   usage
-   exit -1
+   usage >&2
+   exit 1
 fi
 
-[ -d /etc/sysconfig ] || sudo mkdir /etc/sysconfig
-
-
 LANGUAGE="$1"
 
-
+# shellcheck disable=SC1091
 . /etc/grml/language-functions
 
-if [ ! -z "$KEYTABLE" ] ; then
-    setvalue KEYTABLE "$KEYTABLE"
-fi
-
-if [ ! -z "XKEYBOARD" ] ; then
-    setvalue XKEYBOARD $XKEYBOARD
+if [ -n "$XKEYBOARD" ] ; then
+  setvalue XKBLAYOUT "$XKEYBOARD"
 fi
 
-
 if [ -z "$DISPLAY" ] ;then
   if [ "$1" = "de" ] ; then
     echo "Loading keymap for Germany..."
@@ -59,6 +46,10 @@ 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
@@ -75,6 +66,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
@@ -88,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..."
@@ -98,6 +97,10 @@ 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 -model jp106 -layout jp
@@ -108,12 +111,20 @@ else
       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."
       echo