projects
/
grml-scripts-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update grml-setkeyboard and grml-setlang
[grml-scripts-core.git]
/
usr_bin
/
grml-lang
diff --git
a/usr_bin/grml-lang
b/usr_bin/grml-lang
index
69926ea
..
bc9fa17
100755
(executable)
--- a/
usr_bin/grml-lang
+++ b/
usr_bin/grml-lang
@@
-4,12
+4,12
@@
# 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.
# 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
Apr 09 13:04:40
CEST 2007 [mika]
+# Latest change: Mon
Jun 04 22:33:29
CEST 2007 [mika]
################################################################################
usage(){
echo "Usage: $0 <language>"
################################################################################
usage(){
echo "Usage: $0 <language>"
- echo "supported values: at, de,
ch
, us"
+ echo "supported values: at, de,
dvorak, ch, jp
, us"
}
if [ $# -lt "1" ] ; then
}
if [ $# -lt "1" ] ; then
@@
-34,6
+34,14
@@
if [ -z "$DISPLAY" ] ;then
echo 'Loading keymap us...'
sudo loadkeys i386/qwerty/us-latin1.kmap.gz
echo -e "\nDone."
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."
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
@@
-43,8
+51,7
@@
modifying keyboard layout. Adjust \$LANG and \$LC_ALL for setting locales." ; ex
case $LANG in *UTF-8) kbd_mode -u ; ;; esac
else
if [ $# = 0 ] ; then
case $LANG in *UTF-8) kbd_mode -u ; ;; esac
else
if [ $# = 0 ] ; then
- echo "Usage: $0 <language>"
- echo "supported values: at, de, ch, us"
+ usage
else
if [ "$1" = "de" ] ; then
echo "Loading keymap for Germany..."
else
if [ "$1" = "de" ] ; then
echo "Loading keymap for Germany..."
@@
-58,6
+65,14
@@
else
echo "Loading keymap for Switzerland..."
setxkbmap ch
echo -e "\nDone."
echo "Loading keymap for Switzerland..."
setxkbmap ch
echo -e "\nDone."
+ elif [ "$1" = "jp" ] ; then
+ echo "Loading keymap for Japan..."
+ 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
elif [ "$1" = "us" ] ; then
echo 'Loading keymap us...'
[ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap || setxkbmap us