Adding upstream version 1.132.1.

[live-boot-grml.git] / scripts / live-functions

diff --git a/scripts/live-functions b/scripts/live-functions
index 60721b4..c5055a0 100644 (file)
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -1,21 +1,60 @@
+#!/bin/sh
 
 . /scripts/functions
+. /live.vars
 
-# Override this so we don't call PROGRESS
-log_end_msg()
+log_wait_msg ()
 {
-       if [ -x /sbin/usplash_write ]; then
-               /sbin/usplash_write "SUCCESS ok"
+       # Print a message and wait for enter
+       if [ -x /sbin/usplash_write ]
+       then
+               /sbin/usplash_write "INPUTENTER ${@}"
+               read nunya < /dev/.initramfs/usplash_outfifo
        fi
-       _log_msg "Done."
+
+       _log_msg "Waiting: ${@} ..."
 }
 
-# Print a message and wait for enter
-log_wait_msg()
+really_export ()
 {
-       if [ -x /sbin/usplash_write ]; then
-               /sbin/usplash_write "INPUTENTER $@"
-               read nunya < /dev/.initramfs/usplash_outfifo
+       STRING="${1}"
+       VALUE="$(eval echo -n \${$STRING})"
+
+       if [ -f /live.vars ] && cat /live.vars | grep -sq "export ${STRING}"
+       then
+               sed -i -e 's/\('${STRING}'=\).*$/\1'${VALUE}'/' /live.vars
+       else
+               echo "export ${STRING}=\"${VALUE}\"" >> /live.vars
+       fi
+
+       eval export "${STRING}"="${VALUE}"
+}
+
+lang2locale() {
+       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;")
+               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
-       _log_msg "Waiting: $@ ..."
 }