From 9816d2833ef67f53e3ad75ce5464f1056eb92634 Mon Sep 17 00:00:00 2001
From: Florent Villard <warly@mandriva.com>
Date: Fri, 5 Sep 2003 16:36:52 +0000
Subject: Apply 64bit patches from gb

---
 scripts/splash.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/scripts/splash.sh b/scripts/splash.sh
index 90ead3c..d7e68f9 100644
--- a/scripts/splash.sh
+++ b/scripts/splash.sh
@@ -26,10 +26,10 @@ else
 fi
 
 gprintf() {
-    # request translations to be always in UTF-8 with OUTPUT_CHARSET=UTF-8
-    if [ -x /bin/gettext -a -n "$1" ]; then
+    # request translations to be always in UTF-8
+        if [ -x /bin/gettext -a -n "$1" ]; then
 	if [ -n "$GP_LANG" ]; then
-	    TEXT=`OUTPUT_CHARSET=UTF-8 LANGUAGE=$GP_LANG LANG=$LANGUAGE gettext -e --domain=$TEXTDOMAIN "$1"`
+	    TEXT=`OUTPUT_CHARSET=UTF-8 LANGUAGE=$GP_LANG LANG=$GP_LANG gettext -e --domain=$TEXTDOMAIN "$1"`
 	else
 	    TEXT=`OUTPUT_CHARSET=UTF-8 LANG=$LANGUAGE gettext -e --domain=$TEXTDOMAIN "$1"`
 	fi
@@ -57,7 +57,7 @@ fi
 
 _shutdown="no"
 _silent="no"
-grep -q silent /proc/cmdline && _silent="yes"
+grep -q silent /proc/cmdline && grep -q silent /proc/splash && _silent="yes"
 test "$runlevel" == "6" -o "$runlevel" == "0" && _shutdown="yes"
 
 if [ "$1" == "verbose" ]; then
@@ -186,7 +186,7 @@ if [ "$progress" == 1 -o "$1" == "start" ]; then
     fi
     _boot=$TEXT
     if [ "$text_x" != "" -a "$text_y" != "" \
-        -a "$text_color" != "" -a "$text_size" != "" -a "$_silent" == "yes" ]; then
+        -a "$text_color" != "" -a "$text_size" != "" -a "$_silent" == "yes" -o "$_shutdown" == "yes" ]; then
         gprintf "Press Esc for verbose mode."
         fbtruetype.static -x $text_x -y $text_y -t $text_color -s $text_size \
   			$custom_font "$_boot $TEXT"
@@ -196,5 +196,3 @@ fi
 # Paint progressbar..
 test -z "$progress_enable" && exit 0
 echo "show $(( 65534 * ( $progress + 1 ) / $num ))" > /proc/splash
-
-
-- 
cgit v1.2.1