projects
/
grml-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump Standards-Version to 4.3.0
[grml-scripts.git]
/
usr_bin
/
grml-lang
diff --git
a/usr_bin/grml-lang
b/usr_bin/grml-lang
index
5c3fafa
..
0e774ae
100755
(executable)
--- a/
usr_bin/grml-lang
+++ b/
usr_bin/grml-lang
@@
-6,7
+6,7
@@
# License: This file is licensed under the GPL v2.
################################################################################
# License: This file is licensed under the GPL v2.
################################################################################
-CONFFILE=/etc/
sysconfig
/keyboard
+CONFFILE=/etc/
default
/keyboard
PN="$(basename $0)"
usage(){
PN="$(basename $0)"
usage(){
@@
-16,36
+16,22
@@
usage(){
setvalue(){
[ -n "$2" ] || return 1
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
}
if [ $# -lt "1" ] ; then
- usage
+ usage
>&2
exit 1
fi
exit 1
fi
-[ -d /etc/sysconfig ] || sudo mkdir /etc/sysconfig
-
-
LANGUAGE="$1"
LANGUAGE="$1"
-
. /etc/grml/language-functions
. /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
fi
-
if [ -z "$DISPLAY" ] ;then
if [ "$1" = "de" ] ; then
echo "Loading keymap for Germany..."
if [ -z "$DISPLAY" ] ;then
if [ "$1" = "de" ] ; then
echo "Loading keymap for Germany..."
@@
-96,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..."
@@
-120,7
+110,11
@@
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..."
echo -e "\nDone."
elif [ "$1" = "es" ] ; then
echo "Loading keymap es..."