From c218e136dfc7555cfb38e87a580a43e6532923a5 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 13 Jun 2011 17:27:24 +0200
Subject: [PATCH] SABnzbd: setup script dir - try 2

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../downloadmanager/SABnzbd/changelog.txt     |  4 ++
 ...6.4-001_remove_default_settings-0.3.patch} | 37 ++++++++++++++-----
 .../SABnzbd/source/bin/SABnzbd.service        |  3 ++
 3 files changed, 34 insertions(+), 10 deletions(-)
 rename packages/addons/service/downloadmanager/SABnzbd/patches/{SABnzbd-0.6.4-001_remove_default_settings-0.2.patch => SABnzbd-0.6.4-001_remove_default_settings-0.3.patch} (83%)

diff --git a/packages/addons/service/downloadmanager/SABnzbd/changelog.txt b/packages/addons/service/downloadmanager/SABnzbd/changelog.txt
index 2703b7f6db..3f998a0303 100644
--- a/packages/addons/service/downloadmanager/SABnzbd/changelog.txt
+++ b/packages/addons/service/downloadmanager/SABnzbd/changelog.txt
@@ -1,3 +1,7 @@
+0.99.3
+- update to SABnzbd-0.6.4
+- presetup script dir
+
 0.99.2
 - update to SABnzbd-0.6.1
 - rework addon
diff --git a/packages/addons/service/downloadmanager/SABnzbd/patches/SABnzbd-0.6.4-001_remove_default_settings-0.2.patch b/packages/addons/service/downloadmanager/SABnzbd/patches/SABnzbd-0.6.4-001_remove_default_settings-0.3.patch
similarity index 83%
rename from packages/addons/service/downloadmanager/SABnzbd/patches/SABnzbd-0.6.4-001_remove_default_settings-0.2.patch
rename to packages/addons/service/downloadmanager/SABnzbd/patches/SABnzbd-0.6.4-001_remove_default_settings-0.3.patch
index cc59ea4d0f..0ce5dbbb2c 100644
--- a/packages/addons/service/downloadmanager/SABnzbd/patches/SABnzbd-0.6.4-001_remove_default_settings-0.2.patch
+++ b/packages/addons/service/downloadmanager/SABnzbd/patches/SABnzbd-0.6.4-001_remove_default_settings-0.3.patch
@@ -1,7 +1,24 @@
-diff -Naur SABnzbd-0.6.1/interfaces/Plush/templates/config_directories.tmpl SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_directories.tmpl
---- SABnzbd-0.6.1/interfaces/Plush/templates/config_directories.tmpl	2011-05-15 10:44:29.000000000 +0200
-+++ SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_directories.tmpl	2011-05-23 20:05:59.254145174 +0200
-@@ -109,49 +109,6 @@
+diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_directories.tmpl SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_directories.tmpl
+--- SABnzbd-0.6.4/interfaces/Plush/templates/config_directories.tmpl	2011-06-08 00:02:34.000000000 +0200
++++ SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_directories.tmpl	2011-06-13 16:37:49.027611932 +0200
+@@ -76,16 +76,6 @@
+           <span class="component-desc">$T('explain-dirscan_speed')</span>
+         </label>
+       </div>
+-      <div class="field-pair">
+-        <label class="nocheck clearfix" for="script_dir">
+-          <span class="component-title">$T('opt-script_dir')</span>
+-          <input type="text" size="50" name="script_dir" id="script_dir" value="$script_dir">
+-        </label>
+-        <label class="nocheck clearfix">
+-          <span class="component-title">&nbsp;</span>
+-          <span class="component-desc">$T('explain-script_dir')</span>
+-        </label>
+-      </div>
+       <div class="field-pair alt">
+         <label class="nocheck clearfix" for="email_dir">
+           <span class="component-title">$T('opt-email_dir')</span>
+@@ -109,49 +99,6 @@
      </fieldset>
    </div><!-- /component-group1 -->
  
@@ -51,9 +68,9 @@ diff -Naur SABnzbd-0.6.1/interfaces/Plush/templates/config_directories.tmpl SABn
    <div class="component-group-last clearfix">
      <div class="component-group-desc">
        <h3>&nbsp;</h3>
-diff -Naur SABnzbd-0.6.1/interfaces/Plush/templates/config_general.tmpl SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_general.tmpl
---- SABnzbd-0.6.1/interfaces/Plush/templates/config_general.tmpl	2011-05-15 10:44:29.000000000 +0200
-+++ SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_general.tmpl	2011-05-23 20:09:03.985485852 +0200
+diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_general.tmpl
+--- SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl	2011-06-08 00:02:34.000000000 +0200
++++ SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_general.tmpl	2011-06-13 16:35:26.411903234 +0200
 @@ -14,82 +14,6 @@
      </div>
      <fieldset class="component-group-list">
@@ -188,9 +205,9 @@ diff -Naur SABnzbd-0.6.1/interfaces/Plush/templates/config_general.tmpl SABnzbd-
      </fieldset>
    </div><!-- /component-group2 -->
  
-diff -Naur SABnzbd-0.6.1/interfaces/Plush/templates/config_switches.tmpl SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_switches.tmpl
---- SABnzbd-0.6.1/interfaces/Plush/templates/config_switches.tmpl	2011-05-15 10:44:29.000000000 +0200
-+++ SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_switches.tmpl	2011-05-23 20:09:53.829117059 +0200
+diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_switches.tmpl SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_switches.tmpl
+--- SABnzbd-0.6.4/interfaces/Plush/templates/config_switches.tmpl	2011-06-08 00:02:34.000000000 +0200
++++ SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_switches.tmpl	2011-06-13 16:35:26.446903654 +0200
 @@ -12,20 +12,6 @@
        <h3>$T('swtag-general')</h3>
      </div>
diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/bin/SABnzbd.service b/packages/addons/service/downloadmanager/SABnzbd/source/bin/SABnzbd.service
index 1771ab5730..4143fee279 100755
--- a/packages/addons/service/downloadmanager/SABnzbd/source/bin/SABnzbd.service
+++ b/packages/addons/service/downloadmanager/SABnzbd/source/bin/SABnzbd.service
@@ -44,6 +44,7 @@ SABNZBD_WEBCOLOR2="gold"
 SABNZBD_LOGDIR="logs"
 SABNZBD_ADMINDIR="admin"
 SABNZBD_BACKUPDIR="backup"
+SABNZBD_SCRIPTDIR="scripts"
 
 SABNZBD_INCOMPLETEDIR="/storage/downloads/incomplete"
 SABNZBD_COMPLETEDIR="/storage/downloads"
@@ -92,6 +93,8 @@ write_ini misc web_color2 $SABNZBD_WEBCOLOR2
 write_ini misc log_dir $SABNZBD_LOGDIR
 write_ini misc admin_dir $SABNZBD_ADMINDIR
 write_ini misc nzb_backup_dir $SABNZBD_BACKUPDIR
+write_ini misc script_dir $SABNZBD_SCRIPTDIR
+
 
 if [ "$SABNZBD_FIRSTRUN" = "yes" ]; then
   mkdir -p "$SABNZBD_INCOMPLETEDIR"