From c88eb6c686a74edf06234f181596212fa160653c Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Sat, 16 Apr 2011 15:34:46 +0100 Subject: Synthesized commit during git-svn import combining previous Mandriva history with Magiea. This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r908 | blino | 2011-04-16 15:34:46 +0100 (Sat, 16 Apr 2011) | 1 line initial bootsplash import (cleaned from Mdv) ------------------------------------------------------------------------ --- scripts/make-boot-splash | 4 ++-- scripts/make-boot-splash-raw | 2 +- scripts/remove-theme | 8 -------- scripts/switch-themes | 3 +-- 4 files changed, 4 insertions(+), 13 deletions(-) (limited to 'scripts') diff --git a/scripts/make-boot-splash b/scripts/make-boot-splash index 3173a7a..f4d5dab 100755 --- a/scripts/make-boot-splash +++ b/scripts/make-boot-splash @@ -3,12 +3,12 @@ # Copyright (C) 2002 by Chmouel Boudjnah # Redistribution of this file is permitted under the terms of the GNU # Public License (GPL) -# $Id$ +# $Id: make-boot-splash 261558 2009-10-07 17:07:28Z fcrozat $ : ${splash_dir=/usr/share/bootsplash} [[ -f /etc/sysconfig/bootsplash ]] && source /etc/sysconfig/bootsplash -[[ -z $THEME ]] && THEME=Mandriva +[[ -z $THEME ]] && THEME=Mageia-Default [ $# = 2 ] || { echo "usage: $0 "; exit 1; } diff --git a/scripts/make-boot-splash-raw b/scripts/make-boot-splash-raw index 2b3c034..f55f830 100755 --- a/scripts/make-boot-splash-raw +++ b/scripts/make-boot-splash-raw @@ -3,7 +3,7 @@ # Copyright (C) 2002 by Chmouel Boudjnah # Redistribution of this file is permitted under the terms of the GNU # Public License (GPL) -# $Id$ +# $Id: make-boot-splash-raw 263874 2009-11-30 18:28:33Z pterjan $ : ${splash_dir=/usr/share/bootsplash} diff --git a/scripts/remove-theme b/scripts/remove-theme index 7bfe9e5..90e1682 100644 --- a/scripts/remove-theme +++ b/scripts/remove-theme @@ -13,7 +13,6 @@ function get_current_theme () { [[ $opt != THEME=* ]] && continue theme=${opt##*=} done < $sysconfig - #[[ -z $theme ]] && theme="Mandriva" echo $theme } @@ -47,13 +46,6 @@ function update_boot () { } theme_to_remove=$1 -if [ "$theme_to_remove" = Mandrakelinux ]; then - # in case we are upgrading mandrakelinux-theme to mandriva-theme - # "remove-theme Mandrakelinux" will be called thinking there is no theme anymore - grep -qi "THEME=Mandriva" $sysconfig && exit 0 -fi - - current_theme=$(get_current_theme) if [ -z "$theme_to_remove" -o "$theme_to_remove" = "$current_theme" ]; then echo Removing $current_theme theme diff --git a/scripts/switch-themes b/scripts/switch-themes index b5b709f..9f8b6c3 100755 --- a/scripts/switch-themes +++ b/scripts/switch-themes @@ -3,7 +3,7 @@ # Copyright (C) 2002 by Chmouel Boudjnah # Redistribution of this file is permitted under the terms of the GNU # Public License (GPL) -# $Id$ +# $Id: switch-themes 261681 2009-10-12 10:16:06Z fcrozat $ plymouthdir=/usr/share/plymouth sysconfig=/etc/sysconfig/bootsplash @@ -23,7 +23,6 @@ function get_current_theme () { [[ $opt != THEME=* ]] && continue theme=${opt##*=} done < $sysconfig - #[[ -z $theme ]] && theme="Mandriva" echo $theme } -- cgit v1.2.1