projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update locales/language handling
[grml-autoconfig.git]
/
autoconfig.functions
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
904bbdb
..
921be17
100755
(executable)
--- a/
autoconfig.functions
+++ b/
autoconfig.functions
@@
-76,6
+76,11
@@
checkgrmlsmall(){
checkgrmlusb(){
grep -q usb /etc/grml_version 2>>$DEBUG && return 0 || return 1
}
checkgrmlusb(){
grep -q usb /etc/grml_version 2>>$DEBUG && return 0 || return 1
}
+
+# execute flite only if it's present
+flitewrapper() {
+ [ -x /usr/bin/flite ] && flite -o play -t "$*"
+}
### }}}
# {{{ filesystems (proc, pts, sys) and fixes
### }}}
# {{{ filesystems (proc, pts, sys) and fixes
@@
-199,12
+204,16
@@
config_language(){
# set default to 'en' in live-cd mode if $LANGUAGE is not yet set:
if [ -z "$INSTALLED" ] ; then
# set default to 'en' in live-cd mode if $LANGUAGE is not yet set:
if [ -z "$INSTALLED" ] ; then
- [ -n "$LANGUAGE" ] || LANGUAGE='
en-utf8
'
+ [ -n "$LANGUAGE" ] || LANGUAGE='
us
'
fi
# if bootoption lang is used update /etc/default/locale, otherwise *not*!
fi
# if bootoption lang is used update /etc/default/locale, otherwise *not*!
- if [ -n "$BOOT_LANGUAGE" ] ; then
- [ -x /usr/sbin/grml-setlang ] && /usr/sbin/grml-setlang "$LANGUAGE"
+ if [ -n "$BOOT_LANGUAGE" -a -x /usr/sbin/grml-setlang ] ; then
+ if checkgrmlsmall ; then
+ /usr/sbin/grml-setlang "POSIX"
+ else
+ /usr/sbin/grml-setlang "$LANGUAGE"
+ fi
fi
# set console font
fi
# set console font
@@
-821,38
+830,29
@@
config_swspeak(){
if checkbootparam swspeak ; then
einfo "Bootoption swspeak found."
if checkbootparam swspeak ; then
einfo "Bootoption swspeak found."
- if [ ! -d /proc/speakup/ ] && ! grep -q speakup /proc/modules ; then
+ if [ ! -d /proc/speakup/ ] && ! grep -q speakup
_soft
/proc/modules ; then
ewarn "Kernel does not support software speakup - trying to load kernel module:" ; eend 0
eindent
einfo "Loading speakup_soft"
if modprobe speakup_soft ; then
eend 0
else
ewarn "Kernel does not support software speakup - trying to load kernel module:" ; eend 0
eindent
einfo "Loading speakup_soft"
if modprobe speakup_soft ; then
eend 0
else
- flite
-o play -t
"Fatal error setting up software speakup"
+ flite
wrapper
"Fatal error setting up software speakup"
eend 1
return 1
fi
eoutdent
fi
eend 1
return 1
fi
eoutdent
fi
- if [ -d /proc/speakup/ ] || grep -q speakup /proc/modules ; then
+ if [ -d /proc/speakup/ ] || grep -q speakup
_soft
/proc/modules ; then
einfo "Kernel supports speakup." ; eend 0
eindent
einfo "Kernel supports speakup." ; eend 0
eindent
- if [ -x /etc/init.d/speech-dispatcher ] ; then
- einfo "Starting speech-dispatcher."
- /etc/init.d/speech-dispatcher start 1>>DEBUG ; eend $?
- einfo "Activating sftsyn in Kernel."
- echo sftsyn >/proc/speakup/synth_name ; eend $?
einfo "Just run swspeak if you want to use software synthesizer via speakup."
einfo "Just run swspeak if you want to use software synthesizer via speakup."
- flite -o play -t "Finished activating software speakup. Just run swspeak when booting finished."
- else
- eerror "speech-dispatcher not available. swspeak will not work without it." ; eend 1
- flite -o play -t "speech-dispatcher not available. speakup will not work without it."
- fi
+ flitewrapper "Finished activating software speakup. Just run swspeak when booting finished."
eoutdent
else
eerror "Kernel does not seem to support speakup. Skipping swspeak." ; eend 1
eoutdent
else
eerror "Kernel does not seem to support speakup. Skipping swspeak." ; eend 1
- flite
-o play -t
"Kernel does not seem to support speakup. Sorry."
+ flite
wrapper
"Kernel does not seem to support speakup. Sorry."
fi
fi
}
fi
fi
}
@@
-877,11
+877,11
@@
config_hwspeak(){
fi
if [ -d /proc/speakup/ ] || grep -q speakup /proc/modules ; then
fi
if [ -d /proc/speakup/ ] || grep -q speakup /proc/modules ; then
- einfo "Kernel s
upports
speakup now." ; eend 0
- flite
-o play -t "Kernel supports
speakup now."
+ einfo "Kernel s
hould support
speakup now." ; eend 0
+ flite
wrapper "Kernel should support
speakup now."
else
eerror "Kernel or hardware do not seem to support speakup. Skipping hwspeak." ; eend 1
else
eerror "Kernel or hardware do not seem to support speakup. Skipping hwspeak." ; eend 1
- flite
-o play -t
"Kernel or hardware do not seem to support speakup. Sorry."
+ flite
wrapper
"Kernel or hardware do not seem to support speakup. Sorry."
fi
fi
}
fi
fi
}
@@
-1771,7
+1771,7
@@
config_netconfig(){
config_blindsound(){
if checkbootparam "blind" ; then
beep
config_blindsound(){
if checkbootparam "blind" ; then
beep
- flite
-o play -t
"welcome to the gremel system"
+ flite
wrapper
"welcome to the gremel system"
fi
}
# }}}
fi
}
# }}}
@@
-1779,7
+1779,7
@@
config_blindsound(){
# {{{ welcome sound
config_welcome(){
if checkbootparam welcome ; then
# {{{ welcome sound
config_welcome(){
if checkbootparam welcome ; then
-
flite -o play -t
"welcome to the gremel system"
+
flitewrapper
"welcome to the gremel system"
fi
}
# }}}
fi
}
# }}}