From acf561b3ed6990643e0154c480e69d4c881a5532 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 9 Feb 2012 16:07:48 +0100
Subject: [PATCH] pyload: fix build, fix install, fix start script

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../service/downloadmanager/pyload/addon      |  2 +-
 .../downloadmanager/pyload/changelog.txt      |  3 ++
 .../pyload/source/bin/pyload.service          |  2 +-
 .../downloadmanager/pyload/source/default.py  |  2 +-
 .../service/downloadmanager/pyload/unpack     | 30 +++++++++++++++++++
 5 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100755 packages/addons/service/downloadmanager/pyload/unpack

diff --git a/packages/addons/service/downloadmanager/pyload/addon b/packages/addons/service/downloadmanager/pyload/addon
index 9fcc55bce4..e8ba37c8e1 100755
--- a/packages/addons/service/downloadmanager/pyload/addon
+++ b/packages/addons/service/downloadmanager/pyload/addon
@@ -33,4 +33,4 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib/Crypto
   cp -R $BUILD/pycrypto*/build/lib.linux*/Crypto/* $ADDON_BUILD/$PKG_ADDON_ID/pylib/Crypto
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pyload
-  cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/pyload
+  cp -PR $PKG_BUILD/pyload/* $ADDON_BUILD/$PKG_ADDON_ID/pyload
diff --git a/packages/addons/service/downloadmanager/pyload/changelog.txt b/packages/addons/service/downloadmanager/pyload/changelog.txt
index 411ed2f4c4..ffb44a6344 100644
--- a/packages/addons/service/downloadmanager/pyload/changelog.txt
+++ b/packages/addons/service/downloadmanager/pyload/changelog.txt
@@ -1,2 +1,5 @@
+2.0.1
+- update to pyload-0.4.9
+
 0.99.1
 - initial version pyload-0.4.7
diff --git a/packages/addons/service/downloadmanager/pyload/source/bin/pyload.service b/packages/addons/service/downloadmanager/pyload/source/bin/pyload.service
index 55d57d5374..4a2a142ffa 100755
--- a/packages/addons/service/downloadmanager/pyload/source/bin/pyload.service
+++ b/packages/addons/service/downloadmanager/pyload/source/bin/pyload.service
@@ -29,4 +29,4 @@
 ################################################################################
 # start pyload
 ################################################################################
-  python $ADDON_DIR/pyload/pyLoadCore.py -daemon --configdir=$ADDON_HOME
+  python $ADDON_DIR/pyload/pyLoadCore.py --daemon --configdir=$ADDON_HOME
diff --git a/packages/addons/service/downloadmanager/pyload/source/default.py b/packages/addons/service/downloadmanager/pyload/source/default.py
index 6a017ac4c2..e2569932ef 100644
--- a/packages/addons/service/downloadmanager/pyload/source/default.py
+++ b/packages/addons/service/downloadmanager/pyload/source/default.py
@@ -20,4 +20,4 @@
 
 import xbmc, time, os, subprocess
 
-os.system("pyload.service")
+subprocess.Popen("pyload.service", shell=True, close_fds=True)
\ No newline at end of file
diff --git a/packages/addons/service/downloadmanager/pyload/unpack b/packages/addons/service/downloadmanager/pyload/unpack
new file mode 100755
index 0000000000..3c3bdec081
--- /dev/null
+++ b/packages/addons/service/downloadmanager/pyload/unpack
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+################################################################################
+#      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
+################################################################################
+
+. config/options $1
+
+ZIP_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
+
+mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
+
+# unzip main archive
+  unzip $SOURCES/$1/$ZIP_PKG -d $BUILD/${PKG_NAME}-${PKG_VERSION} >/dev/null 2>&1