From 0f990d51184c6bde23d21d4ab2f62ec1b824b2a6 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 7 Mar 2012 19:27:54 +0200 Subject: [PATCH 1/6] transmission: add possibilty to start / stop addon from addon manager with enable / disable --- ...ransmission.service => transmission.start} | 14 +++++++- .../transmission/source/bin/transmission.stop | 32 +++++++++++++++++++ .../transmission/source/default.py | 16 ++++++++-- 3 files changed, 59 insertions(+), 3 deletions(-) rename packages/addons/service/downloadmanager/transmission/source/bin/{transmission.service => transmission.start} (89%) create mode 100755 packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.service b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start similarity index 89% rename from packages/addons/service/downloadmanager/transmission/source/bin/transmission.service rename to packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index c8893fd38e..3edcc50b2e 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.service +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start @@ -26,6 +26,9 @@ ADDON_DIR="$HOME/.xbmc/addons/service.downloadmanager.transmission" ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.transmission" LOG_FILE="$ADDON_HOME/service.log" +LOCKDIR="/var/lock/" +LOCKFILE="transmission.disabled" + export TRANSMISSION_WEB_HOME="$ADDON_DIR/web" mkdir -p $ADDON_HOME @@ -67,5 +70,14 @@ fi if [ ! "$(pidof transmission-daemon)" ];then chmod +x $ADDON_DIR/lib/* - LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" transmission-daemon $TRANSMISSION_ARG &>$LOG_FILE + if [ -f "$LOCKDIR/$LOCKFILE" ] ; then + rm -rf "$LOCKDIR/$LOCKFILE" + fi + while [ true ] ; do + if [ -f "$LOCKDIR/$LOCKFILE" ] ; then + break + fi + LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" transmission-daemon -f $TRANSMISSION_ARG &>$LOG_FILE + sleep 1 + done & fi diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop new file mode 100755 index 0000000000..0bded7b9b3 --- /dev/null +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop @@ -0,0 +1,32 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. /etc/profile + +LOCKDIR="/var/lock/" +LOCKFILE="transmission.disabled" + +if [ "$(pidof transmission-daemon)" ];then + mkdir -p "$LOCKDIR" + touch "$LOCKDIR/$LOCKFILE" + killall -9 transmission-daemon +fi diff --git a/packages/addons/service/downloadmanager/transmission/source/default.py b/packages/addons/service/downloadmanager/transmission/source/default.py index 053d217ef5..25e184d622 100644 --- a/packages/addons/service/downloadmanager/transmission/source/default.py +++ b/packages/addons/service/downloadmanager/transmission/source/default.py @@ -21,12 +21,24 @@ import os import sys import xbmcaddon +import time +import subprocess __scriptname__ = "Transmission BT Client" __author__ = "OpenELEC" __url__ = "http://www.openelec.tv" __settings__ = xbmcaddon.Addon(id='service.downloadmanager.transmission') __cwd__ = __settings__.getAddonInfo('path') -__path__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "transmission.service") ) +__start__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "transmission.start") ) +__stop__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "transmission.stop") ) + +#make binary files executable in adson bin folder +subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True) + +subprocess.Popen(__start__, shell=True, close_fds=True) + +while (not xbmc.abortRequested): + time.sleep(0.250) + +subprocess.Popen(__stop__, shell=True, close_fds=True) -os.system(__path__) From a0240d6d38e3e83fc1f84cce1d53fa6f3aed6f3a Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 7 Mar 2012 19:29:56 +0200 Subject: [PATCH 2/6] transmission: update to transmission-2.50 - -utp.patch not needed anymore --- .../service/downloadmanager/transmission/meta | 2 +- .../patches/transmission-2.42-utp.patch | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 packages/addons/service/downloadmanager/transmission/patches/transmission-2.42-utp.patch diff --git a/packages/addons/service/downloadmanager/transmission/meta b/packages/addons/service/downloadmanager/transmission/meta index 1b1975c57b..1a3d4af461 100644 --- a/packages/addons/service/downloadmanager/transmission/meta +++ b/packages/addons/service/downloadmanager/transmission/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="transmission" -PKG_VERSION="2.42" +PKG_VERSION="2.50" PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/addons/service/downloadmanager/transmission/patches/transmission-2.42-utp.patch b/packages/addons/service/downloadmanager/transmission/patches/transmission-2.42-utp.patch deleted file mode 100644 index 1978f7af18..0000000000 --- a/packages/addons/service/downloadmanager/transmission/patches/transmission-2.42-utp.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/third-party/libutp/utypes.h.orig Wed Sep 28 19:46:15 2011 -+++ b/third-party/libutp/utypes.h Wed Sep 28 19:47:06 2011 -@@ -36,7 +36,11 @@ typedef const char * cstr; - typedef char * str; - - #ifndef __cplusplus -+#ifdef HAVE_STDBOOL_H -+#include -+#else - typedef uint8 bool; -+#endif - #endif - - #endif //__UTYPES_H__ From 1e1bc93ba34d4854a39e9ec67551ad4848fab22b Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 7 Mar 2012 19:34:10 +0200 Subject: [PATCH 3/6] transmission: bump addon version --- packages/addons/service/downloadmanager/transmission/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/downloadmanager/transmission/meta b/packages/addons/service/downloadmanager/transmission/meta index 1a3d4af461..802289041c 100644 --- a/packages/addons/service/downloadmanager/transmission/meta +++ b/packages/addons/service/downloadmanager/transmission/meta @@ -20,7 +20,7 @@ PKG_NAME="transmission" PKG_VERSION="2.50" -PKG_REV="3" +PKG_REV="4" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.transmissionbt.com/" From d2fb5e746d1c2327eee28c522ae9358802966a3b Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 Mar 2012 01:18:56 +0200 Subject: [PATCH 4/6] transmission: update changelog --- .../addons/service/downloadmanager/transmission/changelog.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/addons/service/downloadmanager/transmission/changelog.txt b/packages/addons/service/downloadmanager/transmission/changelog.txt index d2419300c6..60cc3e3695 100644 --- a/packages/addons/service/downloadmanager/transmission/changelog.txt +++ b/packages/addons/service/downloadmanager/transmission/changelog.txt @@ -1,3 +1,6 @@ +2.0.4 +- update to transmission-2.50 + 2.0.3 - rebuild for libiconv changes From 10e0d8235e78a1dcf6fb0272852b07a7b27ee466 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 Mar 2012 19:18:28 +0200 Subject: [PATCH 5/6] transmission: remove 'chmod +x lib/*' --- .../downloadmanager/transmission/source/bin/transmission.start | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index 3edcc50b2e..a3c803818a 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start @@ -68,8 +68,6 @@ else fi if [ ! "$(pidof transmission-daemon)" ];then - chmod +x $ADDON_DIR/lib/* - if [ -f "$LOCKDIR/$LOCKFILE" ] ; then rm -rf "$LOCKDIR/$LOCKFILE" fi From 060981bedb7435024969ad33a8a0753871ca083c Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 Mar 2012 19:29:41 +0200 Subject: [PATCH 6/6] packages/*: remove 'chmod +x lib/*' --- packages/addons/debugging/tools/evtest/source/bin/evtest | 2 -- .../addons/debugging/tools/evtest/source/bin/evtest-capture | 2 -- packages/addons/debugging/tools/htop/source/bin/htop | 2 -- packages/addons/driver/xbmc-wiimote/source/bin/wiimote.service | 2 -- packages/addons/multimedia/makemkv/source/bin/makemkvcon | 1 - packages/addons/shell/texteditor/nano/source/bin/nano | 2 -- packages/mediacenter/xbmc-pvr/init.d/93_xbmc | 3 --- packages/mediacenter/xbmc/init.d/93_xbmc | 3 --- 8 files changed, 17 deletions(-) diff --git a/packages/addons/debugging/tools/evtest/source/bin/evtest b/packages/addons/debugging/tools/evtest/source/bin/evtest index 8b48819bef..ebde28eb29 100755 --- a/packages/addons/debugging/tools/evtest/source/bin/evtest +++ b/packages/addons/debugging/tools/evtest/source/bin/evtest @@ -24,6 +24,4 @@ ADDON_DIR="$HOME/.xbmc/addons/debug.tools.evtest" -chmod +x $ADDON_DIR/lib/* - LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" evtest.bin $@ diff --git a/packages/addons/debugging/tools/evtest/source/bin/evtest-capture b/packages/addons/debugging/tools/evtest/source/bin/evtest-capture index 9a87880fa5..716d71dbcd 100755 --- a/packages/addons/debugging/tools/evtest/source/bin/evtest-capture +++ b/packages/addons/debugging/tools/evtest/source/bin/evtest-capture @@ -24,6 +24,4 @@ ADDON_DIR="$HOME/.xbmc/addons/debug.tools.evtest" -chmod +x $ADDON_DIR/lib/* - LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" evtest-capture.bin $@ diff --git a/packages/addons/debugging/tools/htop/source/bin/htop b/packages/addons/debugging/tools/htop/source/bin/htop index 49ce1a20d1..47eebfa154 100755 --- a/packages/addons/debugging/tools/htop/source/bin/htop +++ b/packages/addons/debugging/tools/htop/source/bin/htop @@ -24,6 +24,4 @@ ADDON_DIR="$HOME/.xbmc/addons/debug.tools.htop" -chmod +x $ADDON_DIR/lib/* - LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" htop.bin $@ diff --git a/packages/addons/driver/xbmc-wiimote/source/bin/wiimote.service b/packages/addons/driver/xbmc-wiimote/source/bin/wiimote.service index 45a92b772e..bc09c11102 100755 --- a/packages/addons/driver/xbmc-wiimote/source/bin/wiimote.service +++ b/packages/addons/driver/xbmc-wiimote/source/bin/wiimote.service @@ -29,6 +29,4 @@ ################################################################################ # start ps3d ################################################################################ - chmod +x $ADDON_DIR/lib/* - LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" wiimote & diff --git a/packages/addons/multimedia/makemkv/source/bin/makemkvcon b/packages/addons/multimedia/makemkv/source/bin/makemkvcon index acd39626b4..b3c55da8a1 100755 --- a/packages/addons/multimedia/makemkv/source/bin/makemkvcon +++ b/packages/addons/multimedia/makemkv/source/bin/makemkvcon @@ -26,5 +26,4 @@ ADDON_DIR="/storage/.xbmc/addons/lib.multimedia.makemkv" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ADDON_DIR/lib" -chmod 755 $ADDON_DIR/lib/* makemkvcon.bin $@ diff --git a/packages/addons/shell/texteditor/nano/source/bin/nano b/packages/addons/shell/texteditor/nano/source/bin/nano index cb5ed06a98..8d765a0962 100755 --- a/packages/addons/shell/texteditor/nano/source/bin/nano +++ b/packages/addons/shell/texteditor/nano/source/bin/nano @@ -24,6 +24,4 @@ ADDON_DIR="$HOME/.xbmc/addons/shell.texteditor.nano" -chmod +x $ADDON_DIR/lib/* - LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" nano.bin $@ diff --git a/packages/mediacenter/xbmc-pvr/init.d/93_xbmc b/packages/mediacenter/xbmc-pvr/init.d/93_xbmc index 15b9c8633e..291cb93a2d 100644 --- a/packages/mediacenter/xbmc-pvr/init.d/93_xbmc +++ b/packages/mediacenter/xbmc-pvr/init.d/93_xbmc @@ -36,9 +36,6 @@ fi # hack: make addon-bins executable chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1 -# hack: make addon-libs executable - chmod +x /storage/.xbmc/addons/*/lib/* > /dev/null 2>&1 - # hack to support user installed fonts SUBFONTS="/storage/.xbmc/userdata/fonts" if [ -d "$SUBFONTS" ]; then diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc index 374955bde2..0413e13e06 100644 --- a/packages/mediacenter/xbmc/init.d/93_xbmc +++ b/packages/mediacenter/xbmc/init.d/93_xbmc @@ -36,9 +36,6 @@ fi # hack: make addon-bins executable chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1 -# hack: make addon-libs executable - chmod +x /storage/.xbmc/addons/*/lib/* > /dev/null 2>&1 - # hack to support user installed fonts SUBFONTS="/storage/.xbmc/userdata/fonts" if [ -d "$SUBFONTS" ]; then