projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.179.
[live-boot-grml.git]
/
scripts
/
live-functions
diff --git
a/scripts/live-functions
b/scripts/live-functions
index
8bf9c38
..
4a23e69
100644
(file)
--- a/
scripts/live-functions
+++ b/
scripts/live-functions
@@
-35,7
+35,7
@@
lang2locale() {
langpart="${1%%_*}"
if [ "$1" != "C" ]; then
# Match the language code with 3rd field in languagelist
langpart="${1%%_*}"
if [ "$1" != "C" ]; then
# Match the language code with 3rd field in languagelist
- line=$(grep -v "^#" /
root/usr/share/live-initramfs/languagelist | cut -f3,4,5
-d\; | grep -v ';C$' | grep "^$langpart;")
+ line=$(grep -v "^#" /
usr/share/live-initramfs/languagelist | cut -f1,3,6
-d\; | grep -v ';C$' | grep "^$langpart;")
if [ -n "$line" ]; then
if [ "$(echo "$line" | grep -c '')" -gt 1 ]; then
# More than one match; try matching the
if [ -n "$line" ]; then
if [ "$(echo "$line" | grep -c '')" -gt 1 ]; then
# More than one match; try matching the