X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F35fix_language_selector;h=8452d1200047702047088b12223920d6a1f7e0ae;hb=ad7598cb46a5a6268ca60e5dba156056fb86c09d;hp=1fb78e51f10476a2eac5a48b8ad319707e6a28ad;hpb=9fc9e2a1a11b0edada38cb501fefe4f58aa414ac;p=live-boot-grml.git

diff --git a/scripts/live-bottom/35fix_language_selector b/scripts/live-bottom/35fix_language_selector
index 1fb78e5..8452d12 100755
--- a/scripts/live-bottom/35fix_language_selector
+++ b/scripts/live-bottom/35fix_language_selector
@@ -1,32 +1,44 @@
-#! /bin/sh
+#!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Fixing language selector..."
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+if [ -n "${NOLANGUAGESELECTOR}" ]
+then
+	exit 0
+fi
+
+. /scripts/live-functions
+
+log_begin_msg "Fixing language selector"
 
-if [ -e /root/usr/share/applications/language-selector.desktop ]; then
-    sed -i '/^Exec/ s|/usr/bin/gnome-language-selector|"& -n"|' /root/usr/share/applications/language-selector.desktop
+# live-initramfs script
 
+if [ -e /root/usr/share/applications/language-selector.desktop ]
+then
+	sed -i '/^Exec/ s|/usr/bin/gnome-language-selector|& -n|' /root/usr/share/applications/language-selector.desktop
 fi
 
-if [ -x /root/usr/bin/fontconfig-voodoo ]; then
-    chroot /root fontconfig-voodoo --auto --quiet || true
+if [ -x /root/usr/bin/fontconfig-voodoo ]
+then
+	chroot /root fontconfig-voodoo --auto --quiet || true
 fi
 
 log_end_msg