fix bad theme initialization if no theme defined

2.0.3
add grub resolution detection in detect-resolution
try to fix i18n pb in splash.sh

4 files changed, 14 insertions, 8 deletions

diff --git a/bootsplash.spec b/bootsplash.spec
index 8a34567..a16eb05 100644
--- a/bootsplash.spec
+++ b/bootsplash.spec
@@ -1,5 +1,5 @@
 %define name bootsplash
-%define version 2.0.2
+%define version 2.0.3
 %define release 1mdk
 %define _bootdir /boot
 
@@ -19,7 +19,7 @@ Requires: mkinitrd > 3.1.6-25mdk
 #there is no way to say a special kernel requires.
 Requires: kernel initscripts > 7.04-15mdk
 Obsoletes: Aurora Aurora-Monitor-NewStyle-Categorizing-WsLib Aurora-Monitor-NewStyle-WsLib Aurora-Monitor-Traditional-Gtk+ Aurora-Monitor-Traditional-WsLib-8.2
-BuildRequires: freetype2-static-devel libmng-static-devel libjpeg62-static-devel glibc-static-devel
+BuildRequires: freetype2-static-devel libmng-static-devel libjpeg-static-devel glibc-static-devel
 # nomore noarch with the fbrelolution and progress binaries
 #BuildArchitectures: noarch
 
@@ -75,6 +75,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
+* Thu Sep 04 2003 Warly <warly@mandrakesoft.com> 2.0.3-1mdk
+- should have fix i18n during boot
+- various fixes in swith-theme
+
 * Sat Aug 16 2003 Pablo Saratxaga <pablo@mandrakesoft.com> 2.0.2-1mdk
 - added support for other fonts, depending on the language
 - now themes are in packages provinding mandrake_theme (warly)
diff --git a/scripts/detect-resolution b/scripts/detect-resolution
index 66a92bd..4155613 100755
--- a/scripts/detect-resolution
+++ b/scripts/detect-resolution
@@ -54,6 +54,8 @@ sub parse_grub_conf {
 	    $entry{$title}{partition} = $1;
 	    $entry{$title}{kernel} = $2;
 	    $entry{$title}{options} = $3;
+	    $vga = $1 if /vga=(.*)/;
+	    $entry{$title}{vga} = $vga if ($label and $vga);
 	}
 	$entry{$title}{initrd} = $1 if m/\s*initrd.*\)(.*)/;
     }
diff --git a/scripts/splash.sh b/scripts/splash.sh
index 2417e7a..90ead3c 100644
--- a/scripts/splash.sh
+++ b/scripts/splash.sh
@@ -29,9 +29,9 @@ gprintf() {
     # request translations to be always in UTF-8 with OUTPUT_CHARSET=UTF-8
     if [ -x /bin/gettext -a -n "$1" ]; then
 	if [ -n "$GP_LANG" ]; then
-	    TEXT=`OUTPUT_CHARSET=UTF-8 LANGUAGE=$GP_LANG gettext -e --domain=$TEXTDOMAIN "$1"`
+	    TEXT=`OUTPUT_CHARSET=UTF-8 LANGUAGE=$GP_LANG LANG=$LANGUAGE gettext -e --domain=$TEXTDOMAIN "$1"`
 	else
-	    TEXT=`OUTPUT_CHARSET=UTF-8 gettext -e --domain=$TEXTDOMAIN "$1"`
+	    TEXT=`OUTPUT_CHARSET=UTF-8 LANG=$LANGUAGE gettext -e --domain=$TEXTDOMAIN "$1"`
 	fi
     else
 	TEXT=$1
diff --git a/scripts/switch-themes b/scripts/switch-themes
index df2cc7e..bec851a 100755
--- a/scripts/switch-themes
+++ b/scripts/switch-themes
@@ -23,7 +23,7 @@ function get_current_theme () {
 	[[ $opt != THEME=* ]] && continue
 	theme=${opt##*=}
     done < $sysconfig
-    [[ -z $theme ]] && theme="Mandrake"
+    #[[ -z $theme ]] && theme="Mandrake"
     echo $theme
 }
 
@@ -101,9 +101,9 @@ function switch_theme () {
 	    echo "THEME=$toswitch" >> $sysconfig
 	fi
 	rm -f $tmpfile
-	if [[ -d /etc/bootsplash/$toswitch ]]; then 
-	    rm -f /etc/bootsplash/current
-	    ln -s /etc/bootsplash/$toswitch current
+	if [[ -d /etc/bootsplash/themes/$toswitch ]]; then 
+	    rm -f /etc/bootsplash/themes/current
+	    ln -s $toswitch /etc/bootsplash/themes/current
         fi
     fi
     lilo_switch_themes $toswitch