[SCM] live-boot branch, debian-next, updated. debian/3.0_a29-1-1-g5f0e0b6
Daniel Baumann
daniel at debian.org
Tue Jun 5 14:17:02 UTC 2012
The following commit has been merged in the debian-next branch:
commit 5f0e0b6d5514c1c9a4d8ca21e13607a6108c1e73
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Jun 5 16:16:58 2012 +0200
Removing dead lang2locale function, not used anywhere.
diff --git a/scripts/boot/misc-helpers.sh b/scripts/boot/misc-helpers.sh
index 3f2d7fb..abb2dd2 100755
--- a/scripts/boot/misc-helpers.sh
+++ b/scripts/boot/misc-helpers.sh
@@ -17,35 +17,6 @@ really_export ()
eval export "${STRING}"="${VALUE}"
}
-lang2locale() {
- langpart="${1%%_*}"
- if [ "$1" != "C" ]; then
- # Match the language code with 3rd field in languagelist
- line=$(grep -v "^#" /usr/share/live-boot/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
- # country as well.
- countrypart="${1#*_}"
- if [ "$countrypart" = "$1" ]; then
- countryline="$(echo "$line" | head -n1)"
- echo "${countryline##*;}"
- return
- fi
- countrypart="${countrypart%%[@.]*}"
- countryline="$(echo "$line" | grep ";$countrypart;" | head -n1 || true)"
- if [ "$countryline" ]; then
- echo "${countryline##*;}"
- return
- fi
- fi
- echo "${line##*;}"
- fi
- else
- echo "C"
- fi
-}
-
is_in_list_separator_helper () {
local sep=${1}
shift
--
live-boot
More information about the debian-live-changes
mailing list