From 73a81881ed269948616d5f98a37e19e46d0247a6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 23 Jan 2011 00:38:57 +0100 Subject: [PATCH] SABnzbd: use our new options dialog Signed-off-by: Stephan Raue --- packages/network/SABnzbd/config/SABnzbd.conf | 26 -------------------- packages/network/SABnzbd/init.d/57_SABnzbd | 6 +++-- packages/network/SABnzbd/install | 5 ---- 3 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 packages/network/SABnzbd/config/SABnzbd.conf diff --git a/packages/network/SABnzbd/config/SABnzbd.conf b/packages/network/SABnzbd/config/SABnzbd.conf deleted file mode 100644 index 99a2d7cd4c..0000000000 --- a/packages/network/SABnzbd/config/SABnzbd.conf +++ /dev/null @@ -1,26 +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 -################################################################################ -# SABnzbd.conf - -# This configuration file allows you to setup 'SABnzbd' a -# Newsgroups downloader daemon - -# Start SABnzbd at boot ( yes / no ) - SABNZBD_START="no" diff --git a/packages/network/SABnzbd/init.d/57_SABnzbd b/packages/network/SABnzbd/init.d/57_SABnzbd index 28bfa157f5..93d9d152e0 100644 --- a/packages/network/SABnzbd/init.d/57_SABnzbd +++ b/packages/network/SABnzbd/init.d/57_SABnzbd @@ -22,9 +22,11 @@ # # runlevels: openelec, textmode +OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" + ( - if [ -f /storage/.config/SABnzbd.conf ]; then - . /storage/.config/SABnzbd.conf + if [ -f "$OPENELEC_SETTINGS" ]; then + SABNZBD_START=`grep SABNZBD_START $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` if [ "$SABNZBD_START" = "yes" ]; then diff --git a/packages/network/SABnzbd/install b/packages/network/SABnzbd/install index c37b6a9775..0bf6db656f 100755 --- a/packages/network/SABnzbd/install +++ b/packages/network/SABnzbd/install @@ -24,11 +24,6 @@ mkdir -p $INSTALL/usr/lib/$1 cp -PR $PKG_BUILD/* $INSTALL/usr/lib/$1 - -mkdir -p $INSTALL/usr/config - cp $PKG_DIR/config/SABnzbd.conf $INSTALL/usr/config - -mkdir -p $INSTALL/usr/config cp $PKG_DIR/config/sabnzbd.config $INSTALL/usr/lib/$1 mkdir -p $INSTALL/etc/avahi/services