xbmc-pvr: sync init scripts with last merge

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/mediacenter/xbmc-pvr/init.d/91_setup-addons

@@ -0,0 +1,44 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+#
+# setup XBMC addons
+#
+# runlevels: openelec, textmode
+
+case $RUNLEVEL in
+  boot)
+    progress "setup XBMC addons"
+
+    # hack: add addons to $PATH
+      for i in `find /storage/.xbmc/addons/* -name bin -type d`; do
+        PATH="$PATH:$i"
+      done
+      export PATH
+
+    # hack: make addon-bins executable
+      chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
+    ;;
+
+  poweroff|reboot)
+    ;;
+esac
+
+

packages/mediacenter/xbmc-pvr/init.d/92_setup-xbmc

@@ -22,19 +22,21 @@
 #
 # runlevels: openelec
 
-progress "setup XBMC"
+case $RUNLEVEL in
+  boot)
+    progress "setup XBMC"
 
-#
+    #
-# clean temp dir
+    # clean temp dir
-#
+    #
       rm -rf $HOME/.xbmc/temp/*
 
-#
+    #
-# add some default settings
+    # add some default settings
-#
+    #
       mkdir -p $HOME/.xbmc/userdata
 
-# use dds fanarts by default
+    # use dds fanarts by default
       if [ ! -f $HOME/.xbmc/userdata/advancedsettings.xml ] ; then
         cat > $HOME/.xbmc/userdata/advancedsettings.xml << EOF
 <advancedsettings>
@@ -49,9 +51,9 @@ progress "setup XBMC"
 EOF
       fi
 
-#
+    #
-# setup directories for XBMC sources
+    # setup directories for XBMC sources
-#
+    #
 
       [ ! -d "$HOME/music" ] && mkdir -p $HOME/music
       [ ! -d "$HOME/pictures" ] && mkdir -p $HOME/pictures
@@ -92,9 +94,9 @@ EOF
 EOF
       fi
 
-#
+    #
-# common setup guisettings
+    # common setup guisettings
-#
+    #
 
       mkdir -p $HOME/.xbmc/userdata
 
@@ -109,17 +111,17 @@ EOF
     </debug>
 EOF
 
-#
+    #
-# include project specific options
+    # include project specific options
-#
+    #
 
       if [ -f /usr/share/xbmc/config/guisettings.xml ]; then
         cat /usr/share/xbmc/config/guisettings.xml >> $HOME/.xbmc/userdata/guisettings.xml
       fi
 
-#
+    #
-# common setup for amd and nvidia graphic
+    # common setup for amd and nvidia graphic
-#
+    #
 
       # Always sync to vblank
         if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "AMD" ] ; then
@@ -131,3 +133,8 @@ EOF
         fi
         echo "</settings>" >> $HOME/.xbmc/userdata/guisettings.xml
       fi
+    ;;
+
+  poweroff|reboot)
+    ;;
+esac

packages/mediacenter/xbmc-pvr/init.d/93_xbmc

@@ -22,21 +22,20 @@
 #
 # runlevels: openelec
 
-LIRCDEV="/var/run/lirc/lircd"
+case $RUNLEVEL in
-[ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans"
+  boot)
-XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
+    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"
+    progress "starting XBMC"
 
-# hack for Boxee Remote
+    # hack for Boxee Remote
-if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then
+    if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then
       export SDL_MOUSE_RELATIVE=0
-fi
+    fi
 
-# hack: make addon-bins executable
+    # starting autostart script (will be removed later again, dont use it!!!)
-  chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
-
-# starting autostart script (will be removed later again, dont use it!!!)
       AUTOSTART="/storage/.config/autostart.sh"
       if [ -f $AUTOSTART ]; then
         echo "!!! AUTOSTART script detected !!!" >> /var/log/messages
@@ -46,19 +45,19 @@ fi
         sh $AUTOSTART
       fi
 
-# starting autoupdate
+    # starting autoupdate
       [ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate &
 
-# waiting for Xorg to start
+    # waiting for Xorg to start
       wait_for_xorg
 
-# set cpu's to 'on demand'
+    # set cpu's to 'on demand'
       ( usleep 15000000
         progress "set cpu's to 'on demand'"
-    cpupower frequency-set -g ondemand
+        cpupower frequency-set -g ondemand > /dev/null 2>&1
       )&
 
-# starting XBMC
+    # starting XBMC
       while true; do
 
         DISPLAY=:0.0 /usr/lib/xbmc/xbmc.bin $XBMC_ARGS > /dev/null 2>&1
@@ -66,13 +65,13 @@ fi
 
         case "$RET" in
           0)
-        poweroff -f
+             RUNLEVEL="poweroff"
             ;;
           64)
-        poweroff -f
+             RUNLEVEL="poweroff"
             ;;
           66)
-        reboot
+             RUNLEVEL="reboot"
             ;;
           255)
             echo "Abnormal Exit. Exited with code $RET"
@@ -85,3 +84,8 @@ fi
 
         usleep 250000
       done
+    ;;
+
+  poweroff|reboot)
+    ;;
+esac