From a128d14e171630fc244cae1ef8a8ee32e300828c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 19 Apr 2011 17:03:09 +0200 Subject: [PATCH] transmission: add configure support, cleanups Signed-off-by: Stephan Raue --- .../addons/downloadmanager/transmission/meta | 4 +- .../transmission/source/start.sh | 53 +++++++++++-------- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/packages/addons/downloadmanager/transmission/meta b/packages/addons/downloadmanager/transmission/meta index 49883994df..6afb5a0f8a 100644 --- a/packages/addons/downloadmanager/transmission/meta +++ b/packages/addons/downloadmanager/transmission/meta @@ -20,12 +20,12 @@ PKG_NAME="transmission" PKG_VERSION="2.20" -PKG_REV="4" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.transmissionbt.com/" PKG_URL="http://download.transmissionbt.com/files/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="zlib libiconv openssl curl libevent connman" +PKG_DEPENDS="zlib libiconv openssl curl libevent" PKG_BUILD_DEPENDS="toolchain libiconv zlib openssl curl libevent" PKG_PRIORITY="optional" PKG_SECTION="downloadmanager" diff --git a/packages/addons/downloadmanager/transmission/source/start.sh b/packages/addons/downloadmanager/transmission/source/start.sh index 152e2d1f77..17163ffc97 100755 --- a/packages/addons/downloadmanager/transmission/source/start.sh +++ b/packages/addons/downloadmanager/transmission/source/start.sh @@ -21,33 +21,42 @@ ################################################################################ export TRANSMISSION_WEB_HOME="./web" +export PATH="$PATH:./bin" + +OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.transmission/settings.xml" + +if [ ! -f "$OPENELEC_SETTINGS" ]; then + cp settings.xml $OPENELEC_SETTINGS +fi + +TRANSMISSION_START=`grep TRANSMISSION_START $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +TRANSMISSION_AUTH=`grep TRANSMISSION_AUTH $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +TRANSMISSION_USER=`grep TRANSMISSION_USER $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +TRANSMISSION_PWD=`grep TRANSMISSION_PWD $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +TRANSMISSION_IP=`grep TRANSMISSION_IP $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` mkdir -p /storage/downloads mkdir -p /storage/downloads/incoming mkdir -p /storage/downloads/watch -#if [ -f /tmp/transmisson.conf ]; then -# . /tmp/transmission.conf +if [ -z "$TRANSMISSION_IP" ]; then + TRANSMISSION_IP="*.*.*.*" +fi - if [ -z "$TRANSMISSION_IP" ]; then - TRANSMISSION_IP="*.*.*.*" - fi +TRANSMISSION_ARG="$TRANSMISSION_ARG -w /storage/downloads" +TRANSMISSION_ARG="$TRANSMISSION_ARG --incomplete-dir /storage/downloads/incoming" +TRANSMISSION_ARG="$TRANSMISSION_ARG --watch-dir /storage/downloads/watch" +TRANSMISSION_ARG="$TRANSMISSION_ARG -e /var/log/transmission.log" +TRANSMISSION_ARG="$TRANSMISSION_ARG -g /storage/.cache/transmission" +TRANSMISSION_ARG="$TRANSMISSION_ARG -a $TRANSMISSION_IP" - TRANSMISSION_ARG="$TRANSMISSION_ARG -w /storage/downloads" - TRANSMISSION_ARG="$TRANSMISSION_ARG --incomplete-dir /storage/downloads/incoming" - TRANSMISSION_ARG="$TRANSMISSION_ARG --watch-dir /storage/downloads/watch" - TRANSMISSION_ARG="$TRANSMISSION_ARG -e /var/log/transmission.log" - TRANSMISSION_ARG="$TRANSMISSION_ARG -g /storage/.cache/transmission" - TRANSMISSION_ARG="$TRANSMISSION_ARG -a $TRANSMISSION_IP" +if [ "$TRANSMISSION_AUTH" = "true" ]; then + TRANSMISSION_ARG="$TRANSMISSION_ARG -t" + TRANSMISSION_ARG="$TRANSMISSION_ARG -u $TRANSMISSION_USER" + TRANSMISSION_ARG="$TRANSMISSION_ARG -v $TRANSMISSION_PWD" +else + TRANSMISSION_ARG="$TRANSMISSION_ARG -T" +fi - if [ "$TRANSMISSION_AUTH" = "true" ]; then - TRANSMISSION_ARG="$TRANSMISSION_ARG -t" - TRANSMISSION_ARG="$TRANSMISSION_ARG -u $TRANSMISSION_USER" - TRANSMISSION_ARG="$TRANSMISSION_ARG -v $TRANSMISSION_PWD" - else - TRANSMISSION_ARG="$TRANSMISSION_ARG -T" - fi - - chmod +x ./bin/transmission-daemon - ./bin/transmission-daemon $TRANSMISSION_ARG -#fi +chmod +x ./bin/transmission-daemon +transmission-daemon $TRANSMISSION_ARG