projects
/
grml-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
grml-setkeyboard + grml-setkeyboard{,.8}: fix typos
[grml-scripts.git]
/
usr_bin
/
grml-lang
diff --git
a/usr_bin/grml-lang
b/usr_bin/grml-lang
index
9d69929
..
0e774ae
100755
(executable)
--- a/
usr_bin/grml-lang
+++ b/
usr_bin/grml-lang
@@
-1,4
+1,4
@@
-#!/bin/sh
+#!/bin/
ba
sh
# Filename: grml-lang
# Purpose: load specific keyboard layout settings
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Filename: grml-lang
# Purpose: load specific keyboard layout settings
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
@@
-6,14
+6,30
@@
# License: This file is licensed under the GPL v2.
################################################################################
# License: This file is licensed under the GPL v2.
################################################################################
+CONFFILE=/etc/default/keyboard
+PN="$(basename $0)"
+
usage(){
echo "Usage: $0 <language>"
usage(){
echo "Usage: $0 <language>"
- echo "supported values: at, ch, de, dvorak, es, jp, us"
+ 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
}
if [ $# -lt "1" ] ; then
- usage
- exit -1
+ usage >&2
+ exit 1
+fi
+
+LANGUAGE="$1"
+
+. /etc/grml/language-functions
+
+if [ -n "$XKEYBOARD" ] ; then
+ setvalue XKBLAYOUT "$XKEYBOARD"
fi
if [ -z "$DISPLAY" ] ;then
fi
if [ -z "$DISPLAY" ] ;then
@@
-29,6
+45,10
@@
if [ -z "$DISPLAY" ] ;then
echo "Loading keymap for Switzerland..."
sudo loadkeys i386/qwertz/sg-latin1.kmap.gz
echo -e "\nDone."
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
elif [ "$1" = "us" ] ; then
echo 'Loading keymap us...'
sudo loadkeys i386/qwerty/us-latin1.kmap.gz
@@
-45,6
+65,10
@@
if [ -z "$DISPLAY" ] ;then
echo 'Loading keymap es...'
sudo loadkeys i386/qwerty/es.kmap.gz
echo -e "\nDone."
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
else echo "No valid parameter given.
Notice: Use loadkeys on console and setxkbmap when running X for
@@
-58,7
+82,11
@@
else
else
if [ "$1" = "de" ] ; then
echo "Loading keymap for Germany..."
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..."
echo -e "\nDone."
elif [ "$1" = "at" ] ; then
echo "Loading keymap for Austria..."
@@
-68,6
+96,10
@@
else
echo "Loading keymap for Switzerland..."
setxkbmap ch
echo -e "\nDone."
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
elif [ "$1" = "jp" ] ; then
echo "Loading keymap for Japan..."
setxkbmap -model jp106 -layout jp
@@
-78,12
+110,20
@@
else
echo -e "\nDone."
elif [ "$1" = "us" ] ; then
echo 'Loading keymap us...'
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."
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
else
echo "No valid parameter given."
echo