From ae1aa106658df35633c9b368d58a9b6f0abaa2f1 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 9 Jan 2011 03:49:02 +0100
Subject: [PATCH] xbmc: rework init scripts

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../xbmc/init.d/{60_setup-xbmc => 92_setup-xbmc}      |  4 ----
 packages/mediacenter/xbmc/init.d/{61_xbmc => 93_xbmc} | 11 +++--------
 2 files changed, 3 insertions(+), 12 deletions(-)
 rename packages/mediacenter/xbmc/init.d/{60_setup-xbmc => 92_setup-xbmc} (99%)
 mode change 100755 => 100644
 rename packages/mediacenter/xbmc/init.d/{61_xbmc => 93_xbmc} (91%)
 mode change 100755 => 100644

diff --git a/packages/mediacenter/xbmc/init.d/60_setup-xbmc b/packages/mediacenter/xbmc/init.d/92_setup-xbmc
old mode 100755
new mode 100644
similarity index 99%
rename from packages/mediacenter/xbmc/init.d/60_setup-xbmc
rename to packages/mediacenter/xbmc/init.d/92_setup-xbmc
index 296ae2252b..459c761722
--- a/packages/mediacenter/xbmc/init.d/60_setup-xbmc
+++ b/packages/mediacenter/xbmc/init.d/92_setup-xbmc
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 ################################################################################
 #      Copyright (C) 2009-2010 OpenELEC.tv
 #      http://www.openelec.tv
@@ -24,8 +22,6 @@
 #
 # runlevels: openelec
 
-. /etc/profile
-
 progress "setup XBMC"
 
 #
diff --git a/packages/mediacenter/xbmc/init.d/61_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc
old mode 100755
new mode 100644
similarity index 91%
rename from packages/mediacenter/xbmc/init.d/61_xbmc
rename to packages/mediacenter/xbmc/init.d/93_xbmc
index 35eb2bee52..b8a34b54c1
--- a/packages/mediacenter/xbmc/init.d/61_xbmc
+++ b/packages/mediacenter/xbmc/init.d/93_xbmc
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 ################################################################################
 #      Copyright (C) 2009-2010 OpenELEC.tv
 #      http://www.openelec.tv
@@ -24,15 +22,12 @@
 #
 # runlevels: openelec
 
-. /etc/profile
+LIRCDEV="/var/run/lirc/lircd"
+[ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans"
+XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
 
 progress "starting XBMC"
 
-  LIRCDEV="/var/run/lirc/lircd"
-  [ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans"
-
-  XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
-
 # starting xbmc-wiimote if avaible
   [ "$(pidof bluetoothd)" -a -f /usr/bin/xbmc-wiiremote ] && \
     /usr/bin/xbmc-wiiremote >/dev/null 2>&1 &