From 2c48bb91eeba7bf5db6231b0c071c5ce3cc96136 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 12 Sep 2011 02:39:11 +0200
Subject: [PATCH] Revert "xbmc: move addon hacks in a own init script"

This reverts commit 94a52caaac995fb624af6ddc3f67f7d3da340879.
---
 .../mediacenter/xbmc/init.d/91_setup-addons   | 44 -------------------
 packages/mediacenter/xbmc/init.d/93_xbmc      |  3 ++
 packages/sysutils/busybox/profile.d/path.conf |  5 +++
 3 files changed, 8 insertions(+), 44 deletions(-)
 delete mode 100644 packages/mediacenter/xbmc/init.d/91_setup-addons

diff --git a/packages/mediacenter/xbmc/init.d/91_setup-addons b/packages/mediacenter/xbmc/init.d/91_setup-addons
deleted file mode 100644
index 9f22b212cd..0000000000
--- a/packages/mediacenter/xbmc/init.d/91_setup-addons
+++ /dev/null
@@ -1,44 +0,0 @@
-################################################################################
-#      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
-
-
diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc
index 1db77b91b2..4b95f893a6 100644
--- a/packages/mediacenter/xbmc/init.d/93_xbmc
+++ b/packages/mediacenter/xbmc/init.d/93_xbmc
@@ -35,6 +35,9 @@ case $RUNLEVEL in
       export SDL_MOUSE_RELATIVE=0
     fi
 
+    # hack: make addon-bins executable
+      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
diff --git a/packages/sysutils/busybox/profile.d/path.conf b/packages/sysutils/busybox/profile.d/path.conf
index 8922da6f75..80d106f6c6 100644
--- a/packages/sysutils/busybox/profile.d/path.conf
+++ b/packages/sysutils/busybox/profile.d/path.conf
@@ -25,4 +25,9 @@
 
 PATH="/bin:/sbin:/usr/bin:/usr/sbin"
 
+# hack: add addons to $PATH
+  for i in `find /storage/.xbmc/addons/* -name bin -type d`; do
+    PATH="$PATH:$i"
+  done
+
 export PATH