From 1bd10b169b524de16a71aeab3fe713b316c78a6d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 3 Apr 2012 03:46:52 +0200
Subject: [PATCH] splashutils: enhance support for project based splash themes

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../sysutils/splashutils/init.d/{03_splash => 04_splash}     | 5 ++++-
 packages/sysutils/splashutils/install                        | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)
 rename packages/sysutils/splashutils/init.d/{03_splash => 04_splash} (92%)

diff --git a/packages/sysutils/splashutils/init.d/03_splash b/packages/sysutils/splashutils/init.d/04_splash
similarity index 92%
rename from packages/sysutils/splashutils/init.d/03_splash
rename to packages/sysutils/splashutils/init.d/04_splash
index dbb4719365..7a380e7bb7 100644
--- a/packages/sysutils/splashutils/init.d/03_splash
+++ b/packages/sysutils/splashutils/init.d/04_splash
@@ -25,8 +25,11 @@
 
 if [ ! "$SPLASH" = "no" ]; then
   progress "starting splash"
+    if [ -z "$SPLASH_THEME" ]; then
+      SPLASH_THEME="default"
+    fi
     mkdir -p /run/splash/cache/
-    fbsplashd --theme=default --type=bootup
+    fbsplashd --theme=$SPLASH_THEME --type=bootup
 
     echo "set tty silent 2"            > /run/splash/cache/.splash
     echo "set tty verbose 6"           > /run/splash/cache/.splash
diff --git a/packages/sysutils/splashutils/install b/packages/sysutils/splashutils/install
index 3a5ca8e550..e46fbe77f9 100755
--- a/packages/sysutils/splashutils/install
+++ b/packages/sysutils/splashutils/install
@@ -34,8 +34,8 @@ mkdir -p $INSTALL/usr/bin
   cp $PKG_BUILD/src/.libs/splash_util $INSTALL/usr/bin
 
 mkdir -p $INSTALL/etc/splash
-  if [ -d $PROJECT_DIR/$PROJECT/splash/default ]; then
-    cp -R $PROJECT_DIR/$PROJECT/splash/default $INSTALL/etc/splash
+  if [ -d $PROJECT_DIR/$PROJECT/splash ]; then
+    cp -R $PROJECT_DIR/$PROJECT/splash/* $INSTALL/etc/splash
   else
     cp -R $PKG_DIR/splash/default $INSTALL/etc/splash
   fi